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

Rex Dieter rdieter at fedoraproject.org
Thu Sep 15 18:39:32 UTC 2011


commit 19ccc40022536edd1f218fee77a7a15e60de6d88
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 15 13:39:12 2011 -0500

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

 kdemultimedia-4.7.1-missing-pthread-linkage.patch |   12 ------------
 kdemultimedia.spec                                |    9 ++-------
 2 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 0f43732..b3d1cd8 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -10,7 +10,7 @@
 Name:    kdemultimedia
 Epoch:   6
 Version: 4.7.1
-Release: 3%{?dist}
+Release: 2%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -21,8 +21,6 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{versi
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.6.2-no_thumbs.patch 
-# Explicitely specify linkage of pthread library
-Patch2: kdemultimedia-4.7.1-missing-pthread-linkage.patch
 
 ## upstream patches
 
@@ -166,7 +164,7 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
-%patch2 -p1 -b .missing-pthread-linkage
+
 
 %build
 
@@ -389,9 +387,6 @@ fi
 
 
 %changelog
-* Wed Sep 14 2011 Radek Novacek <rnovacek at redhat.com> 6:4.7.1-3
-- Fix build failure by adding pthread linkage explicitely
-
 * Wed Sep 14 2011 Radek Novacek <rnovacek at redhat.com> 6:4.7.1-2
 - Fixed typo
 


More information about the scm-commits mailing list