rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.104,1.105

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13095/F-10

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
- disable manpath patch for now, does more harm than good (#532071)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- kdebase-runtime.spec	9 Nov 2009 13:19:28 -0000	1.104
+++ kdebase-runtime.spec	15 Nov 2009 00:46:32 -0000	1.105
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora}
 %define flags 1
 %endif
@@ -6,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.3
-Release:       2%{?dist}
+Release:       5%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -29,11 +28,11 @@ Patch6:        kdebase-runtime-4.3.3-hom
 ## Upstream patches
 
 # when kdesu was removed, this is/should-be only temporary
-%if 0%{?fedora} < 11
+%if 0%{?fedora} && 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
-%if 0%{?fedora} < 12
+%if 0%{?fedora} && 0%{?fedora} < 12
 # kcm_filetypes moved to here
 Conflicts: kdebase4 < 4.3.0
 %endif
@@ -64,7 +63,6 @@ BuildRequires: kdepimlibs-devel >= %{ver
 BuildRequires: libsmbclient-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
-BuildRequires: openslp-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
@@ -72,6 +70,7 @@ BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.3.0
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
+BuildRequires: openslp-devel
 %endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -109,7 +108,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-%patch5 -p1 -b .manpath
+#patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
 
 
@@ -228,6 +227,15 @@ fi
 
 
 %changelog
+* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
+- disable manpath patch for now, does more harm than good (#532071)
+
+* Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-4
+- rhel cleanup, fix conditional for RHEL
+
+* Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-3
+- rhel cleanup, drop BR on openslp-devel
+
 * Thu Nov 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-2
 - add OnlyShowIn=KDE to Desktop/Home.desktop (like trash.desktop)