[digikam/f20: 22/23] Revert "backport "Reorder mutex lock" fix (#1091113)"

Rex Dieter rdieter at fedoraproject.org
Tue Jul 1 19:00:18 UTC 2014


commit 3329f0339a1c3fc10fd8fd5ae438238d0a2acb60
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 13:59:41 2014 -0500

    Revert "backport "Reorder mutex lock" fix (#1091113)"
    
    This reverts commit 21d678989d96339290eae39c89049f9866f1fdfc.

 ...ex-locks-the-ImageInfo-ReadWriteLock-must.patch |  108 --------------------
 digikam.spec                                       |   10 +--
 2 files changed, 1 insertions(+), 117 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index cdd3401..e4cd082 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 5%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -25,8 +25,6 @@ Patch51:  digikam-3.1.0-opencv20.patch
 ## upstream patches
 # git 3d1a27f9
 Patch100: digikam-3.5.0-panorama-crasher.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1091113
-Patch101: 0765-Reorder-mutex-locks-the-ImageInfo-ReadWriteLock-must.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -233,9 +231,6 @@ BuildArch: noarch
 %endif
 
 %patch100 -p1 -b .panaroma-crasher
-pushd core
-%patch101 -p1 -b .mutex
-popd
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
@@ -537,9 +532,6 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Fri Apr 25 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.0-5
-- backport "Reorder mutex lock" fix (#1091113)
-
 * Tue Feb 04 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.0-4
 - rebuild (kde-4.12)
 


More information about the scm-commits mailing list