[packages/qoauth] - added x32.patch (fixed location of libraries)

witekfl witekfl at pld-linux.org
Wed Apr 1 20:41:57 CEST 2015


commit d757cd72830947660d02df007c98bb6a721facee
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Wed Apr 1 18:40:37 2015 +0000

    - added x32.patch (fixed location of libraries)

 qoauth.spec |  4 +++-
 x32.patch   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/qoauth.spec b/qoauth.spec
index 25cdee8..126b768 100644
--- a/qoauth.spec
+++ b/qoauth.spec
@@ -2,11 +2,12 @@ Summary:	qoauth - Qt OAuth Support Library
 Summary(pl.UTF-8):	qoauth - biblioteka Qt wsparcia dla OAuth
 Name:		qoauth
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://files.ayoy.net/qoauth/release/current/src/%{name}-%{version}-src.tar.bz2
 # Source0-md5:	bcb6d01e6c9a6fb22099c9e0f5889578
+Patch0:		x32.patch
 URL:		http://files.ayoy.net/qoauth/doc/
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtTest-devel
@@ -33,6 +34,7 @@ Header files for qoauth library.
 
 %prep
 %setup -q -n %{name}-%{version}-src
+%patch0 -p1
 
 %build
 qmake-qt4 qoauth.pro \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..5e2775a
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,32 @@
+--- qoauth-1.0.1-src/src/pcfile.sh.orig	2015-04-01 17:52:00.000000000 +0000
++++ qoauth-1.0.1-src/src/pcfile.sh	2015-04-01 17:52:16.000000000 +0000
+@@ -4,7 +4,7 @@
+ 
+ echo "prefix=$1
+ exec_prefix=\${prefix}
+-libdir=\${prefix}/lib
++libdir=\${prefix}/$3
+ includedir=\${prefix}/include/QtOAuth
+ 
+ Name: QOAuth
+--- qoauth-1.0.1-src/src/src.pro.orig	2015-04-01 17:46:57.000000000 +0000
++++ qoauth-1.0.1-src/src/src.pro	2015-04-01 18:25:54.000000000 +0000
+@@ -58,14 +58,11 @@ else:unix {
+     else:INSTALL_PREFIX = $${PREFIX}
+ 
+     # this creates a pkgconfig file
+-    system( ./pcfile.sh $${INSTALL_PREFIX} $${VERSION} )
+     pkgconfig.files = qoauth.pc
+-    
+-    contains(QMAKE_HOST.arch, x86_64) {
+-      target.path = $${INSTALL_PREFIX}/lib64
+-    } else {
+-      target.path = $${INSTALL_PREFIX}/lib
+-    }
++    target.path = $$[QT_INSTALL_LIBS]
++    LIBDIR = $$basename( target.path )
++
++    system( ./pcfile.sh $${INSTALL_PREFIX} $${VERSION} $${LIBDIR} )
+ 
+     headers.path = $${INSTALL_PREFIX}/include/QtOAuth
+     docs.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}-$${VERSION}/html
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qoauth.git/commitdiff/d757cd72830947660d02df007c98bb6a721facee



More information about the pld-cvs-commit mailing list