rpms/kaffeine/devel kaffeine.spec,1.46,1.47

Rex Dieter rdieter at fedoraproject.org
Mon Jul 5 00:19:08 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31659

Modified Files:
	kaffeine.spec 
Log Message:
minor esthetics wrt macros in scriptlets



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kaffeine.spec	4 Jul 2010 21:06:45 -0000	1.46
+++ kaffeine.spec	5 Jul 2010 00:19:08 -0000	1.47
@@ -49,8 +49,7 @@ make install/fast DESTDIR=%{buildroot} -
 mv %{buildroot}%{_kde4_iconsdir}/oxygen \
    %{buildroot}%{_kde4_iconsdir}/hicolor
 
-mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
-install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
 
 %find_lang %{name} --with-kde
 
@@ -64,18 +63,18 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
   update-desktop-database %{_datadir}/applications &>/dev/null
-  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 fi
 
 %posttrans
 update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang



More information about the scm-commits mailing list