rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.39,1.40

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Apr 28 15:59:22 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7153/F-9

Modified Files:
	kdebase-runtime.spec 
Log Message:
fix kde3_desktop=1 case



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdebase-runtime.spec	28 Apr 2008 15:14:53 -0000	1.39
+++ kdebase-runtime.spec	28 Apr 2008 15:58:46 -0000	1.40
@@ -225,13 +225,13 @@
 %post
 /sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %if 0%{?icons}
@@ -269,9 +269,9 @@
 %{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
-%{_kde4_iconsdir}/hicolor/*/*/*
 
-%if 0%{?kde3_desktop} == 0
+%if ! 0%{?kde3_desktop}
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
 %{_kde4_datadir}/applications/kde4/Help.desktop




More information about the scm-commits mailing list