rpms/kdegraphics/devel kdegraphics.spec,1.117,1.118

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12316

Modified Files:
	kdegraphics.spec 
Log Message:
get rid of useless define for F9



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdegraphics.spec	6 Dec 2007 16:36:41 -0000	1.117
+++ kdegraphics.spec	7 Dec 2007 14:58:56 -0000	1.118
@@ -6,16 +6,12 @@
 Version:        3.97.0
 Release:        2%{?dist}
 
-%if 0%{?fedora} > 9
 Name:           kdegraphics
 Obsoletes:      kdegraphics4 < %{version}-%{release}
 Provides:       kdegraphics4 = %{version}-%{release}
 # kdegraphics now includes gwenview(2)
 Obsoletes:      gwenview < 2
 Provides:       gwenview >= 2
-%else
-Name:          kdegraphics4
-%endif
 
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -58,7 +54,6 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 
 
-%if "%{name}" == "kdegraphics"
 %description
 Graphics applications for the K Desktop Environment, including
 * gwenview (an image viewer)
@@ -69,16 +64,6 @@
 * ksnapshot (screen capture utility)
 * okular (a document viewer)
 
-%else
-
-%description
-Graphics applications for the K Desktop Environment 4, including
-* okular (a document viewer)
-
-This applications is supposed to run in a normal KDE 3 installation.
-
-%endif
-
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
@@ -90,10 +75,8 @@
 Group:    Development/Libraries
 Summary:  Header files for %{name}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdegraphics4"
 Obsoletes: kdegraphics4-devel < %{version}-%{release}
 Provides:  kdegraphics4-devel = %{version}-%{release}
-%endif
 Requires: kdelibs4-devel
 %description devel
 Header files for developing applications using %{name}.
@@ -137,79 +120,17 @@
 done
 popd
 
-%if "%{name}" != "kdegraphics"
-# remove files which conflict with KDE 3
-rm -rf %{buildroot}%{_kde4_bindir}/gwenview
-rm -rf %{buildroot}%{_kde4_bindir}/kbackgroundsnapshot
-rm -rf %{buildroot}%{_kde4_bindir}/kcolorchooser
-rm -rf %{buildroot}%{_kde4_bindir}/kolourpaint4
-rm -rf %{buildroot}%{_kde4_bindir}/kruler
-rm -rf %{buildroot}%{_kde4_bindir}/ksnapshot
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/gsthumbnail.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/gvpart.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/kcm_kamera.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/kio_kamera.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/kio_msits.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/kscanplugin.so
-rm -rf %{buildroot}%{_kde4_libdir}/libgwenviewlib.so.*
-rm -rf %{buildroot}%{_kde4_libdir}/libkolourpaint4_lgpl.so.*
-rm -rf %{buildroot}%{_kde4_libdir}/strigi/strigita_dvi.so
-rm -rf %{buildroot}%{_kde4_libdir}/strigi/strigita_ico.so
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/gwenview.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kcolorchooser.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kolourpaint4.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kruler.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/ksnapshot.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/dbus-1/interfaces/org.kde.ksnapshot.xml
-rm -rf %{buildroot}%{_kde4_datadir}/doc/HTML/en/kamera/
-rm -rf %{buildroot}%{_kde4_datadir}/doc/HTML/en/kolourpaint4/
-rm -rf %{buildroot}%{_kde4_datadir}/doc/HTML/en/kruler/
-rm -rf %{buildroot}%{_kde4_datadir}/doc/HTML/en/ksnapshot/
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/*/apps/kolourpaint4.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/*/apps/kruler.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/*/apps/ksnapshot.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/scalable/apps/kolourpaint4.svgz
-rm -rf %{buildroot}%{_kde4_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
-rm -rf %{buildroot}%{_kde4_datadir}/icons/oxygen/16x16/actions/palette_color.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/oxygen/16x16/actions/palette_gray.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/oxygen/16x16/actions/palette_halftone.png
-rm -rf %{buildroot}%{_kde4_datadir}/icons/oxygen/16x16/actions/palette_lineart.png
-rm -rf %{buildroot}%{_kde4_appsdir}/gvpart
-rm -rf %{buildroot}%{_kde4_appsdir}/gvpart/gvpart.rc
-rm -rf %{buildroot}%{_kde4_appsdir}/gwenview
-rm -rf %{buildroot}%{_kde4_appsdir}/gwenview/gwenviewui.rc
-rm -rf %{buildroot}%{_kde4_appsdir}/kolourpaint4/
-rm -rf %{buildroot}%{_kde4_appsdir}/kruler/
-rm -rf %{buildroot}%{_kde4_appsdir}/svgpart/
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/camera.protocol
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/gsthumbnail.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/gvpart.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/kamera.desktop
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/msits.protocol
-rm -rf %{buildroot}%{_kde4_datadir}/kde4/services/scanservice.desktop
-# devel files
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/devel/libgwenviewlib.so
-rm -rf %{buildroot}%{_kde4_libdir}/kde4/devel/libkolourpaint4_lgpl.so
-%endif
-
-
-
 %clean
 rm -rf %{buildroot}
 
 %post
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%if "%{name}" == "kdegraphics"
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%if "%{name}" == "kdegraphics"
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
@@ -229,7 +150,6 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/okular/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%if "%{name}" == "kdegraphics"
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
 %{_kde4_appsdir}/kolourpaint4/
@@ -241,7 +161,6 @@
 %{_kde4_docdir}/HTML/en/kolourpaint4/
 %{_kde4_docdir}/HTML/en/kruler/
 %{_kde4_iconsdir}/oxygen/*/*/*
-%endif
 
 %files libs 
 %defattr(-,root,root,-)
@@ -250,19 +169,18 @@
 %{_kde4_libdir}/libspectreOkular.so
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-%if "%{name}" == "kdegraphics"
 %{_kde4_libdir}/strigi/*
-%endif
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/okular/
-%if "%{name}" == "kdegraphics"
 %{_kde4_libdir}/kde4/devel/*
-%endif
 
 %changelog
+* Fri Dec 07 2007 Than Ngo <than at redhat.com> 3.97.0-2
+- get rid of useless define for F9
+
 * Thu Dec 06 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
 - don't hardcode %%fedora
 - Requires: lpr (provided by cups) for printing in Okular