From db9e275422e9ac3a524566d8c34d137267e82271 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 25 Jul 2019 17:09:02 +0300 Subject: [PATCH] Fix rpm package. [skip ci] Error "directories not owned by a package". --HG-- branch : develop --- dist/debian/valentina.install | 5 + dist/rpm/valentina.spec | 65 ++++++++---- share/icons/128x128/{ => apps}/tape.png | Bin share/icons/128x128/{ => apps}/valentina.png | Bin ...application-x-valentina-i-measurements.png | Bin .../application-x-valentina-pattern.png | Bin ...application-x-valentina-s-measurements.png | Bin share/icons/256x256/{ => apps}/tape.png | Bin share/icons/256x256/{ => apps}/valentina.png | Bin ...application-x-valentina-i-measurements.png | Bin .../application-x-valentina-pattern.png | Bin ...application-x-valentina-s-measurements.png | Bin share/icons/48x48/{ => apps}/tape.png | Bin share/icons/48x48/{ => apps}/valentina.png | Bin ...application-x-valentina-i-measurements.png | Bin .../application-x-valentina-pattern.png | Bin ...application-x-valentina-s-measurements.png | Bin share/icons/512x512/{ => apps}/tape.png | Bin share/icons/512x512/{ => apps}/valentina.png | Bin ...application-x-valentina-i-measurements.png | Bin .../application-x-valentina-pattern.png | Bin ...application-x-valentina-s-measurements.png | Bin share/icons/64x64/{ => apps}/tape.png | Bin share/icons/64x64/{ => apps}/valentina.png | Bin ...application-x-valentina-i-measurements.png | Bin .../application-x-valentina-pattern.png | Bin ...application-x-valentina-s-measurements.png | Bin src/app/valentina/valentina.pro | 100 +++++++++++------- 28 files changed, 109 insertions(+), 61 deletions(-) rename share/icons/128x128/{ => apps}/tape.png (100%) rename share/icons/128x128/{ => apps}/valentina.png (100%) rename share/icons/128x128/{ => mimetypes}/application-x-valentina-i-measurements.png (100%) rename share/icons/128x128/{ => mimetypes}/application-x-valentina-pattern.png (100%) rename share/icons/128x128/{ => mimetypes}/application-x-valentina-s-measurements.png (100%) rename share/icons/256x256/{ => apps}/tape.png (100%) rename share/icons/256x256/{ => apps}/valentina.png (100%) rename share/icons/256x256/{ => mimetypes}/application-x-valentina-i-measurements.png (100%) rename share/icons/256x256/{ => mimetypes}/application-x-valentina-pattern.png (100%) rename share/icons/256x256/{ => mimetypes}/application-x-valentina-s-measurements.png (100%) rename share/icons/48x48/{ => apps}/tape.png (100%) rename share/icons/48x48/{ => apps}/valentina.png (100%) rename share/icons/48x48/{ => mimetypes}/application-x-valentina-i-measurements.png (100%) rename share/icons/48x48/{ => mimetypes}/application-x-valentina-pattern.png (100%) rename share/icons/48x48/{ => mimetypes}/application-x-valentina-s-measurements.png (100%) rename share/icons/512x512/{ => apps}/tape.png (100%) rename share/icons/512x512/{ => apps}/valentina.png (100%) rename share/icons/512x512/{ => mimetypes}/application-x-valentina-i-measurements.png (100%) rename share/icons/512x512/{ => mimetypes}/application-x-valentina-pattern.png (100%) rename share/icons/512x512/{ => mimetypes}/application-x-valentina-s-measurements.png (100%) rename share/icons/64x64/{ => apps}/tape.png (100%) rename share/icons/64x64/{ => apps}/valentina.png (100%) rename share/icons/64x64/{ => mimetypes}/application-x-valentina-i-measurements.png (100%) rename share/icons/64x64/{ => mimetypes}/application-x-valentina-pattern.png (100%) rename share/icons/64x64/{ => mimetypes}/application-x-valentina-s-measurements.png (100%) diff --git a/dist/debian/valentina.install b/dist/debian/valentina.install index 33bfb5ae4..a933781e9 100644 --- a/dist/debian/valentina.install +++ b/dist/debian/valentina.install @@ -6,8 +6,13 @@ usr/share/valentina/tables/multisize/* usr/share/valentina/tables/templates/* usr/share/valentina/labels/* usr/share/icons/hicolor/48x48/apps/* +usr/share/icons/hicolor/48x48/mimetypes/* usr/share/icons/hicolor/64x64/apps/* +usr/share/icons/hicolor/64x64/mimetypes/* usr/share/icons/hicolor/128x128/apps/* +usr/share/icons/hicolor/128x128/mimetypes/* usr/share/icons/hicolor/256x256/apps/* +usr/share/icons/hicolor/256x256/mimetypes/* usr/share/icons/hicolor/512x512/apps/* +usr/share/icons/hicolor/512x512/mimetypes/* usr/share/applications/* diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 6f5203610..bb834fd96 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -140,14 +140,20 @@ cp dist/debian/valentina.mime dist/debian/%{name} && %post /sbin/ldconfig -/usr/bin/update-desktop-database &> /dev/null || : -/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : +update-desktop-database &> /dev/null ||: +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %postun /sbin/ldconfig -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +update-desktop-database &> /dev/null ||: +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %posttrans @@ -160,7 +166,8 @@ fi %files %defattr(-,root,root,-) -%doc README.txt LICENSE_GPL.txt +%doc README.txt +%license LICENSE_GPL.txt %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/tape.1* %{_bindir}/valentina @@ -169,29 +176,45 @@ fi %{_libdir}/libvpropertyexplorer.so.* %{_libdir}/libqmuparser.so %{_libdir}/libqmuparser.so.* -%dir %{_libdir}/mime -%dir %{_libdir}/mime/packages +%dir %{_libdir}/mime/ +%dir %{_libdir}/mime/packages/ %{_libdir}/mime/packages/%{name} -%dir %{_datadir}/mime -%dir %{_datadir}/mime/packages +%dir %{_datadir}/mime/ +%dir %{_datadir}/mime/packages/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/tape.desktop -%{_datadir}/icons/hicolor/48x48/apps/* -%{_datadir}/icons/hicolor/64x64/apps/* -%{_datadir}/icons/hicolor/128x128/apps/* -%{_datadir}/icons/hicolor/256x256/apps/* -%{_datadir}/icons/hicolor/512x512/apps/* -%dir %{_datadir}/%{name} + +%dir %{_datadir}/icons/ +%dir %{_datadir}/icons/hicolor/ +%dir %{_datadir}/icons/hicolor/48x48/ +%dir %{_datadir}/icons/hicolor/48x48/apps/ +%dir %{_datadir}/icons/hicolor/48x48/mimetypes/ +%dir %{_datadir}/icons/hicolor/64x64/ +%dir %{_datadir}/icons/hicolor/64x64/apps/ +%dir %{_datadir}/icons/hicolor/64x64/mimetypes/ +%dir %{_datadir}/icons/hicolor/128x128/ +%dir %{_datadir}/icons/hicolor/128x128/apps/ +%dir %{_datadir}/icons/hicolor/128x128/mimetypes/ +%dir %{_datadir}/icons/hicolor/256x256/ +%dir %{_datadir}/icons/hicolor/256x256/apps/ +%dir %{_datadir}/icons/hicolor/256x256/mimetypes/ +%dir %{_datadir}/icons/hicolor/512x512/ +%dir %{_datadir}/icons/hicolor/512x512/apps/ +%dir %{_datadir}/icons/hicolor/512x512/mimetypes/ +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/mimetypes/*.png + +%dir %{_datadir}/%{name}/ %{_datadir}/%{name}/diagrams.rcc -%dir %{_datadir}/%{name}/translations +%dir %{_datadir}/%{name}/translations/ %{_datadir}/%{name}/translations/*.qm -%dir %{_datadir}/%{name}/tables -%dir %{_datadir}/%{name}/tables/multisize +%dir %{_datadir}/%{name}/tables/ +%dir %{_datadir}/%{name}/tables/multisize/ %{_datadir}/%{name}/tables/multisize/*.vst -%dir %{_datadir}/%{name}/tables/templates +%dir %{_datadir}/%{name}/tables/templates/ %{_datadir}/%{name}/tables/templates/*.vit -%dir %{_datadir}/%{name}/labels +%dir %{_datadir}/%{name}/labels/ %{_datadir}/%{name}/labels/*.xml %clean diff --git a/share/icons/128x128/tape.png b/share/icons/128x128/apps/tape.png similarity index 100% rename from share/icons/128x128/tape.png rename to share/icons/128x128/apps/tape.png diff --git a/share/icons/128x128/valentina.png b/share/icons/128x128/apps/valentina.png similarity index 100% rename from share/icons/128x128/valentina.png rename to share/icons/128x128/apps/valentina.png diff --git a/share/icons/128x128/application-x-valentina-i-measurements.png b/share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png similarity index 100% rename from share/icons/128x128/application-x-valentina-i-measurements.png rename to share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png diff --git a/share/icons/128x128/application-x-valentina-pattern.png b/share/icons/128x128/mimetypes/application-x-valentina-pattern.png similarity index 100% rename from share/icons/128x128/application-x-valentina-pattern.png rename to share/icons/128x128/mimetypes/application-x-valentina-pattern.png diff --git a/share/icons/128x128/application-x-valentina-s-measurements.png b/share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png similarity index 100% rename from share/icons/128x128/application-x-valentina-s-measurements.png rename to share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png diff --git a/share/icons/256x256/tape.png b/share/icons/256x256/apps/tape.png similarity index 100% rename from share/icons/256x256/tape.png rename to share/icons/256x256/apps/tape.png diff --git a/share/icons/256x256/valentina.png b/share/icons/256x256/apps/valentina.png similarity index 100% rename from share/icons/256x256/valentina.png rename to share/icons/256x256/apps/valentina.png diff --git a/share/icons/256x256/application-x-valentina-i-measurements.png b/share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png similarity index 100% rename from share/icons/256x256/application-x-valentina-i-measurements.png rename to share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png diff --git a/share/icons/256x256/application-x-valentina-pattern.png b/share/icons/256x256/mimetypes/application-x-valentina-pattern.png similarity index 100% rename from share/icons/256x256/application-x-valentina-pattern.png rename to share/icons/256x256/mimetypes/application-x-valentina-pattern.png diff --git a/share/icons/256x256/application-x-valentina-s-measurements.png b/share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png similarity index 100% rename from share/icons/256x256/application-x-valentina-s-measurements.png rename to share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png diff --git a/share/icons/48x48/tape.png b/share/icons/48x48/apps/tape.png similarity index 100% rename from share/icons/48x48/tape.png rename to share/icons/48x48/apps/tape.png diff --git a/share/icons/48x48/valentina.png b/share/icons/48x48/apps/valentina.png similarity index 100% rename from share/icons/48x48/valentina.png rename to share/icons/48x48/apps/valentina.png diff --git a/share/icons/48x48/application-x-valentina-i-measurements.png b/share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png similarity index 100% rename from share/icons/48x48/application-x-valentina-i-measurements.png rename to share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png diff --git a/share/icons/48x48/application-x-valentina-pattern.png b/share/icons/48x48/mimetypes/application-x-valentina-pattern.png similarity index 100% rename from share/icons/48x48/application-x-valentina-pattern.png rename to share/icons/48x48/mimetypes/application-x-valentina-pattern.png diff --git a/share/icons/48x48/application-x-valentina-s-measurements.png b/share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png similarity index 100% rename from share/icons/48x48/application-x-valentina-s-measurements.png rename to share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png diff --git a/share/icons/512x512/tape.png b/share/icons/512x512/apps/tape.png similarity index 100% rename from share/icons/512x512/tape.png rename to share/icons/512x512/apps/tape.png diff --git a/share/icons/512x512/valentina.png b/share/icons/512x512/apps/valentina.png similarity index 100% rename from share/icons/512x512/valentina.png rename to share/icons/512x512/apps/valentina.png diff --git a/share/icons/512x512/application-x-valentina-i-measurements.png b/share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png similarity index 100% rename from share/icons/512x512/application-x-valentina-i-measurements.png rename to share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png diff --git a/share/icons/512x512/application-x-valentina-pattern.png b/share/icons/512x512/mimetypes/application-x-valentina-pattern.png similarity index 100% rename from share/icons/512x512/application-x-valentina-pattern.png rename to share/icons/512x512/mimetypes/application-x-valentina-pattern.png diff --git a/share/icons/512x512/application-x-valentina-s-measurements.png b/share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png similarity index 100% rename from share/icons/512x512/application-x-valentina-s-measurements.png rename to share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png diff --git a/share/icons/64x64/tape.png b/share/icons/64x64/apps/tape.png similarity index 100% rename from share/icons/64x64/tape.png rename to share/icons/64x64/apps/tape.png diff --git a/share/icons/64x64/valentina.png b/share/icons/64x64/apps/valentina.png similarity index 100% rename from share/icons/64x64/valentina.png rename to share/icons/64x64/apps/valentina.png diff --git a/share/icons/64x64/application-x-valentina-i-measurements.png b/share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png similarity index 100% rename from share/icons/64x64/application-x-valentina-i-measurements.png rename to share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png diff --git a/share/icons/64x64/application-x-valentina-pattern.png b/share/icons/64x64/mimetypes/application-x-valentina-pattern.png similarity index 100% rename from share/icons/64x64/application-x-valentina-pattern.png rename to share/icons/64x64/mimetypes/application-x-valentina-pattern.png diff --git a/share/icons/64x64/application-x-valentina-s-measurements.png b/share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png similarity index 100% rename from share/icons/64x64/application-x-valentina-s-measurements.png rename to share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index b59ec387f..6b9f94cfa 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -163,45 +163,60 @@ unix{ desktop.files += ../../../dist/tape.desktop # logo - hicolor_48.path = $$PREFIX/share/icons/hicolor/48x48/apps/ - hicolor_48.files += \ - ../../../share/icons/48x48/$${TARGET}.png \ - ../../../share/icons/48x48/tape.png \ - ../../../share/icons/48x48/application-x-valentina-pattern.png \ - ../../../share/icons/48x48/application-x-valentina-i-measurements.png \ - ../../../share/icons/48x48/application-x-valentina-s-measurements.png + hicolor_48_apps.path = $$PREFIX/share/icons/hicolor/48x48/apps/ + hicolor_48_apps.files += \ + ../../../share/icons/48x48/apps/$${TARGET}.png \ + ../../../share/icons/48x48/apps/tape.png - hicolor_64.path = $$PREFIX/share/icons/hicolor/64x64/apps/ - hicolor_64.files += \ - ../../../share/icons/64x64/$${TARGET}.png \ - ../../../share/icons/64x64/tape.png \ - ../../../share/icons/64x64/application-x-valentina-pattern.png \ - ../../../share/icons/64x64/application-x-valentina-i-measurements.png \ - ../../../share/icons/64x64/application-x-valentina-s-measurements.png + hicolor_48_mimetypes.path = $$PREFIX/share/icons/hicolor/48x48/mimetypes/ + hicolor_48_mimetypes.files += \ + ../../../share/icons/48x48/mimetypes/application-x-valentina-pattern.png \ + ../../../share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png \ + ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png - hicolor_128.path = $$PREFIX/share/icons/hicolor/128x128/apps/ - hicolor_128.files += \ - ../../../share/icons/128x128/$${TARGET}.png \ - ../../../share/icons/128x128/tape.png \ - ../../../share/icons/128x128/application-x-valentina-pattern.png \ - ../../../share/icons/128x128/application-x-valentina-i-measurements.png \ - ../../../share/icons/128x128/application-x-valentina-s-measurements.png + hicolor_64_apps.path = $$PREFIX/share/icons/hicolor/64x64/apps/ + hicolor_64_apps.files += \ + ../../../share/icons/64x64/apps/$${TARGET}.png \ + ../../../share/icons/64x64/apps/tape.png - hicolor_256.path = $$PREFIX/share/icons/hicolor/256x256/apps/ - hicolor_256.files += \ - ../../../share/icons/256x256/$${TARGET}.png \ - ../../../share/icons/256x256/tape.png \ - ../../../share/icons/256x256/application-x-valentina-pattern.png \ - ../../../share/icons/256x256/application-x-valentina-i-measurements.png \ - ../../../share/icons/256x256/application-x-valentina-s-measurements.png + hicolor_64_mimetypes.path = $$PREFIX/share/icons/hicolor/64x64/mimetypes/ + hicolor_64_mimetypes.files += \ + ../../../share/icons/64x64/mimetypes/application-x-valentina-pattern.png \ + ../../../share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png \ + ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png - hicolor_512.path = $$PREFIX/share/icons/hicolor/512x512/apps/ - hicolor_512.files += \ - ../../../share/icons/512x512/$${TARGET}.png \ - ../../../share/icons/512x512/tape.png \ - ../../../share/icons/512x512/application-x-valentina-pattern.png \ - ../../../share/icons/512x512/application-x-valentina-i-measurements.png \ - ../../../share/icons/512x512/application-x-valentina-s-measurements.png + hicolor_128_apps.path = $$PREFIX/share/icons/hicolor/128x128/apps/ + hicolor_128_apps.files += \ + ../../../share/icons/128x128/apps/$${TARGET}.png \ + ../../../share/icons/128x128/apps/tape.png + + hicolor_128_mimetypes.path = $$PREFIX/share/icons/hicolor/128x128/mimetypes/ + hicolor_128_mimetypes.files += \ + ../../../share/icons/128x128/mimetypes/application-x-valentina-pattern.png \ + ../../../share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png \ + ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png + + hicolor_256_apps.path = $$PREFIX/share/icons/hicolor/256x256/apps/ + hicolor_256_apps.files += \ + ../../../share/icons/256x256/apps/$${TARGET}.png \ + ../../../share/icons/256x256/apps/tape.png + + hicolor_256_mimetypes.path = $$PREFIX/share/icons/hicolor/256x256/mimetypes/ + hicolor_256_mimetypes.files += \ + ../../../share/icons/256x256/mimetypes/application-x-valentina-pattern.png \ + ../../../share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png \ + ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png + + hicolor_512_apps.path = $$PREFIX/share/icons/hicolor/512x512/apps/ + hicolor_512_apps.files += \ + ../../../share/icons/512x512/apps/$${TARGET}.png \ + ../../../share/icons/512x512/apps/tape.png + + hicolor_512_mimetypes.path = $$PREFIX/share/icons/hicolor/512x512/mimetypes/ + hicolor_512_mimetypes.files += \ + ../../../share/icons/512x512/mimetypes/application-x-valentina-pattern.png \ + ../../../share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png \ + ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png # Path to translation files after installation translations.path = $$PREFIX/share/$${TARGET}/translations/ @@ -223,11 +238,16 @@ unix{ target \ tape \ desktop \ - hicolor_48 \ - hicolor_64 \ - hicolor_128 \ - hicolor_256 \ - hicolor_512 \ + hicolor_48_apps \ + hicolor_48_mimetypes \ + hicolor_64_apps \ + hicolor_64_mimetypes \ + hicolor_128_apps \ + hicolor_128_mimetypes \ + hicolor_256_apps \ + hicolor_256_mimetypes \ + hicolor_512_apps \ + hicolor_512_mimetypes \ translations \ multisize \ templates \