[qrencode] Actually apply the LIBPTHREAD patch.

Peter Gordon pgordon at fedoraproject.org
Sat Feb 25 18:23:11 UTC 2012


commit f4660342e26c90c3de30095e2029bed295d605f2
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Sat Feb 25 10:22:59 2012 -0800

    Actually apply the LIBPTHREAD patch.

 qrencode-fix-LIBPTHREAD-macro.patch |    2 +-
 qrencode.spec                       |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/qrencode-fix-LIBPTHREAD-macro.patch b/qrencode-fix-LIBPTHREAD-macro.patch
index 9062949..ab804bf 100644
--- a/qrencode-fix-LIBPTHREAD-macro.patch
+++ b/qrencode-fix-LIBPTHREAD-macro.patch
@@ -1,5 +1,5 @@
 --- ./libqrencode.pc.in.orig	2012-02-20 15:36:29.983533958 -0800
-+++ ./libqrencode.pc.in.orig	2012-02-20 15:56:41.252501662 -0800
++++ ./libqrencode.pc.in	2012-02-20 15:56:41.252501662 -0800
 @@ -6,5 +6,5 @@ includedir=@includedir@
  Name: libqrencode
  Description: A QR Code encoding library
diff --git a/qrencode.spec b/qrencode.spec
index 7f28cc8..e01a94e 100644
--- a/qrencode.spec
+++ b/qrencode.spec
@@ -1,6 +1,6 @@
 Name:           qrencode
 Version:        3.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate QR 2D barcodes
 
 Group:          Applications/Engineering
@@ -8,6 +8,8 @@ License:        LGPLv2+
 URL:            http://megaui.net/fukuchi/works/qrencode/index.en.html
 Source0:        http://megaui.net/fukuchi/works/qrencode/%{name}-%{version}.tar.gz
 
+Patch0: 	%{name}-fix-LIBPTHREAD-macro.patch
+
 BuildRequires:  libpng-devel chrpath
 
 
@@ -26,6 +28,7 @@ applications that use qrencode.
 
 %prep
 %setup -q
+%patch0 -b .fix-LIBPTHREAD-macro.patch
 
 
 %build
@@ -61,6 +64,9 @@ sh test_all.sh
 
 
 %changelog
+* Sat Feb 25 2012 Peter Gordon <peter at thecodergeek.com> - 3.2.0-3
+- Fix applying the LIBPTHREAD patch. (Thanks to Matthieu Saulnier.)
+
 * Thu Feb 23 2012 Peter Gordon <peter at thecodergeek.com> - 3.2.0-2
 - Add patch to fix improper LIBPTHREAD macro in the pkgconfig file:
   + fix-LIBPTHREAD-macro.patch


More information about the scm-commits mailing list