rpms/kdelibs/devel kdelibs.spec,1.509,1.510

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2270

Modified Files:
	kdelibs.spec 
Log Message:
- workaround for glibc on x86_64 (rawhide), it causes build failure,
  will be removed when it's fixed in glibc




Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- kdelibs.spec	28 Aug 2009 20:59:30 -0000	1.509
+++ kdelibs.spec	1 Sep 2009 12:21:49 -0000	1.510
@@ -201,15 +201,9 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -222,6 +216,14 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 %build
 
+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
+# workaround for glibc on x86_64 (rawhide)
+%ifarch x86_64
+sed -i -e "s|-std=iso9899:1990||" cmake/modules/FindKDE4Internal.cmake
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..