[kover] .spec cleanup, update scriptlets

Rex Dieter rdieter at fedoraproject.org
Mon Aug 18 15:57:40 UTC 2014


commit 8c5283946ed6c30233ec0b37e40acad7b08d9e29
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Aug 18 10:57:33 2014 -0500

    .spec cleanup, update scriptlets

 kover.spec |   66 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 39 insertions(+), 27 deletions(-)
---
diff --git a/kover.spec b/kover.spec
index 8f6d71c..91db196 100644
--- a/kover.spec
+++ b/kover.spec
@@ -1,9 +1,8 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
-Group: Applications/Publishing
 Source0: http://lisas.de/kover/kover-6.tar.bz2
 URL: http://lisas.de/kover/
 BuildRequires: desktop-file-utils
@@ -26,51 +25,64 @@ popd
 %{__make} %{?_smp_mflags} -C %{_target_platform}
 
 %install
-make install DESTDIR=%{buildroot} -C %{_target_platform}
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
 desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
-  --vendor fedora \
-%endif
-  --delete-original \
+%if %if 0%{?fedora} && 0%{?fedora} < 21
   --dir %{buildroot}%{_datadir}/applications \
+  --delete-original \
+%else
+  --dir %{buildroot}%{_datadir}/applications/kde4 \
+%endif
   --add-category Utility \
   --add-category AudioVideo \
   %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
-%{__rm} -rf %{buildroot}%{_datadir}/applications/kde4
-
 %{__install} -p -D %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png \
 	%{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-%{name}.png
 
-%find_lang %{name}
+%find_lang %{name} --with-kde
+
+## unpackaged files
+rm -rfv %{buildroot}%{_datadir}/icons/locolor
+
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+fi
 
 %files -f %{name}.lang
-%defattr(644,root,root,755)
 %doc AUTHORS README COPYING NEWS THANKS ChangeLog
-%dir %{_datadir}/kde4/apps/kover
-%{_datadir}/kde4/apps/kover/koverui.rc
-%{_datadir}/icons/kover*
-%{_datadir}/icons/*/*/*/*
+%{_kde4_appsdir}/kover/
+%{_kde4_iconsdir}/kover*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_datadir}/mime/packages/*
 %{_mandir}/man1/*
-%{_datadir}/applications/*
-%attr(755,root,root)%{_bindir}/kover
+%if %if 0%{?fedora} && 0%{?fedora} < 21
+%{_datadir}/applications/%{name}.desktop
+%else
+%{_datadir}/applications/kde4/%{name}.desktop
+%endif
+%{_kde4_bindir}/kover
 
 %changelog
+* Mon Aug 18 2014 Rex Dieter <rdieter at fedoraproject.org> 6-9
+- .spec cleanup, update scriptlets
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list