rpms/kdelibs/F-10 kdelibs.spec, 1.424, 1.425 kdelibs-4.2.0-gcc44-misc.patch, 1.1, NONE kdelibs-4.2.0-gcc44-workaround.patch, 1.1, NONE

Than Ngo than at fedoraproject.org
Mon May 4 21:41:10 UTC 2009


Author: than

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7292

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.0-gcc44-misc.patch 
	kdelibs-4.2.0-gcc44-workaround.patch 
Log Message:
better fix for strcasestr detection



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- kdelibs.spec	4 May 2009 14:22:24 -0000	1.424
+++ kdelibs.spec	4 May 2009 21:40:39 -0000	1.425
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
 Patch22: kdelibs-4.1.96-cmake.patch
-Patch23: kdelibs-4.2.0-gcc44-workaround.patch
-Patch25: kdelibs-4.2.0-gcc44-misc.patch
 
 # upstream
 # 4.2 branch
+Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch22 -p1 -b .kdepimlibs-cmake
-%patch23 -p1 -b .gcc44
-%patch25 -p1 -b .gcc44-misc
 
 # upstream patches
 # 4.2
+%patch100 -p1 -b .strcasestr-glibc2.9
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -407,6 +405,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
+- better fix for strcasestr detection
+
 * Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
 - 4.2.3
 


--- kdelibs-4.2.0-gcc44-misc.patch DELETED ---


--- kdelibs-4.2.0-gcc44-workaround.patch DELETED ---




More information about the scm-commits mailing list