[kdelibs] Revert "Fix build failure by adding pthread linkage explicitely"

Rex Dieter rdieter at fedoraproject.org
Thu Sep 15 18:38:52 UTC 2011


commit 60b21b6ab4d266597a310a94c2ebce9f844646bd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 15 13:38:28 2011 -0500

    Revert "Fix build failure by adding pthread linkage explicitely"
    
    This reverts commit 060432be2bf424b54a219ff184baef6cec3a8cec.

 kdelibs-4.7.1-missing-pthread-linkage.patch |   24 ------------------------
 kdelibs.spec                                |    9 +--------
 2 files changed, 1 insertions(+), 32 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index ee3bcb4..a5b2ba2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,7 +20,7 @@
 
 Summary: KDE Libraries
 Version: 4.7.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -89,9 +89,6 @@ Patch18: kdelibs-4.6.90-kstandarddirs.patch
 # set build type
 Patch20: kdelibs-4.1.70-cmake.patch
 
-# Explicitely specify linkage of pthread library
-Patch21: kdelibs-4.7.1-missing-pthread-linkage.patch
-
 # die rpath die, since we're using standard paths, we can avoid
 # this extra hassle (even though cmake is *supposed* to not add standard
 # paths (like /usr/lib64) already! With this, we can drop
@@ -300,7 +297,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch21 -p1 -b .missing-pthread-linkage
 %patch27 -p1 -b .no_rpath
 
 # libplasma PackageKit integration
@@ -565,9 +561,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep 14 2011 Radek Novacek <rnovacek at redhat.com> 4.7.1-2
-- Fix build failure by adding pthread linkage explicitely
-
 * Fri Sep 02 2011 Than Ngo <than at redhat.com> - 4.7.1-1
 - 4.7.1
 


More information about the scm-commits mailing list