[lipstick] Own installation directories. Contributes to JB#22780

sailfishos · Jan 18, 2019 · 5569a07 · 5569a07
1 parent 735e64c
commit 5569a07
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -48,7 +48,7 @@ BuildRequires:  doxygen
 BuildRequires:  qt5-qttools-qthelp-devel
 Conflicts:   meegotouch-systemui < 1.5.7
 Obsoletes:   libnotificationsystem0
-Obsoletes:   lipstick-qt5-screenshot
+Obsoletes:   %{name}-screenshot
 
 %description
 A QML toolkit for homescreen creation
@@ -137,28 +137,23 @@ install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d/
 %files
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/dbus-1/system.d/lipstick.conf
-%{_libdir}/liblipstick-qt5.so.*
-%dir %{_libdir}/qt5/qml/org/nemomobile/lipstick
-%{_libdir}/qt5/qml/org/nemomobile/lipstick/liblipstickplugin.so
-%{_libdir}/qt5/qml/org/nemomobile/lipstick/qmldir
-%{_datadir}/translations/lipstick_eng_en.qm
-%dir %{_datadir}/lipstick
-%dir %{_datadir}/lipstick/notificationcategories
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/qt5/qml/org/nemomobile/lipstick
+%{_datadir}/translations/*.qm
+%{_datadir}/lipstick
 %{_datadir}/mapplauncherd/privileges.d/*
-%{_datadir}/lipstick/notificationcategories/*.conf
-%{_datadir}/lipstick/androidnotificationpriorities
 %dir %{icondirectory}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/lipstick-qt5/*.h
-%{_libdir}/liblipstick-qt5.so
-%{_libdir}/liblipstick-qt5.prl
-%{_libdir}/pkgconfig/lipstick-qt5.pc
+%{_includedir}/%{name}
+%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}.prl
+%{_libdir}/pkgconfig/%{name}.pc
 
 %files tests
 %defattr(-,root,root,-)
-/opt/tests/lipstick-tests/*
+/opt/tests/lipstick-tests
 
 %files tools
 %defattr(-,root,root,-)
@@ -167,16 +162,16 @@ install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d/
 %files simplecompositor
 %defattr(-,root,root,-)
 %{_bindir}/simplecompositor
-%{_datadir}/lipstick/simplecompositor/*
+%{_datadir}/lipstick/simplecompositor
 
 %files doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/lipstick/*
+%{_datadir}/doc/lipstick
 
 %files notification-doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/lipstick-notification/*
+%{_datadir}/doc/lipstick-notification
 
 %files ts-devel
 %defattr(-,root,root,-)
-%{_datadir}/translations/source/lipstick.ts
+%{_datadir}/translations/source/*.ts