rpms/kdebase-runtime/devel kdebase-runtime.spec,1.105,1.106

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14988

Modified Files:
	kdebase-runtime.spec 
Log Message:
cleanup/fix kde3_desktop logic



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kdebase-runtime.spec	1 Apr 2009 14:11:51 -0000	1.105
+++ kdebase-runtime.spec	1 Apr 2009 14:30:35 -0000	1.106
@@ -1,6 +1,6 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%define kde3_desktop 1
+%global kde3_desktop 1
 %else
 # curently broken due to noarch build of oxygen-icon-theme
 # when oxygen-icon-theme review is done, they can be omitted from 
@@ -258,21 +258,26 @@
 rm -rf %{buildroot}
 
 
+%if ! 0%{?kde3_desktop}
 %post
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
 
 %posttrans
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+%if ! 0%{?kde3_desktop}
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
 update-desktop-database -q &> /dev/null ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+%if ! 0%{?kde3_desktop}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi