rpms/kdebase-workspace/devel kdebase-workspace.spec,1.278,1.279

Than Ngo than at fedoraproject.org
Wed Sep 2 07:57:33 UTC 2009


Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28332

Modified Files:
	kdebase-workspace.spec 
Log Message:
drop support fedora < 9 



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- kdebase-workspace.spec	30 Aug 2009 20:25:41 -0000	1.278
+++ kdebase-workspace.spec	2 Sep 2009 07:57:31 -0000	1.279
@@ -39,23 +39,12 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 
 Requires: PolicyKit-authentication-agent
 
-# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
-%if 0%{?fedora} == 9
-# upgrade path: kdebase(3) -> kdebase-workspace
-Obsoletes: kdebase < 6:4
-# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
-Requires: kdebase4
-%endif
-
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
-
-%if 0%{?fedora} > 10
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
 # -> powerdevel upgrade path
 Obsoletes: guidance-power-manager < 4.3
-%endif
 
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
@@ -160,9 +149,7 @@ Requires: %{name} = %{version}-%{release
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%if 0%{?fedora} > 9 
 BuildArch: noarch
-%endif
 %description wallpapers
 %{summary}.
 
@@ -186,9 +173,7 @@ Group:   System Environment/Daemons
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 %description -n oxygen-cursor-themes
 %{summary}.
 
@@ -550,8 +535,6 @@ fi
 %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_docdir}/HTML/en/PolicyKit-kde/
-#files -n PolicyKit-kde-libs
-#defattr(-,root,root,-)
 %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 
 %files python-applet




More information about the scm-commits mailing list