[packages/podofo] fix libdir install on x32

glen glen at pld-linux.org
Sat Mar 21 09:57:54 CET 2015


commit 1a3a170d25ab77ef000c643e7536e10144ca7de6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 21 08:57:49 2015 +0000

    fix libdir install on x32

 libdir.patch | 22 ++++++++++++++++++++++
 podofo.spec  |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/podofo.spec b/podofo.spec
index f8c0141..d67dac0 100644
--- a/podofo.spec
+++ b/podofo.spec
@@ -6,12 +6,13 @@ Summary:	Library to work with PDF files
 Summary(pl.UTF-8):	Biblioteka do obsługi PDF-ów
 Name:		podofo
 Version:	0.9.3
-Release:	1
+Release:	2
 License:	LGPL with OpenSSL exception
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/podofo/%{name}-%{version}.tar.gz
 # Source0-md5:	268ca111826757ca7e3f5c4be3547e7a
 Patch0:		%{name}-build.patch
+Patch1:		libdir.patch
 URL:		http://podofo.sourceforge.net/
 BuildRequires:	cmake >= 2.6
 BuildRequires:	cppunit-devel
@@ -115,6 +116,7 @@ Programy przykładowe do PoDoFo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 0000000..f882e60
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,22 @@
+--- podofo-0.9.3/CMakeLists.txt~	2015-03-21 08:41:12.000000000 +0000
++++ podofo-0.9.3/CMakeLists.txt	2015-03-21 08:41:14.738341023 +0000
+@@ -49,6 +49,10 @@
+     SET(PODOFO_BUILD_SHARED NOT ${PODOFO_BUILD_STATIC})
+ ENDIF(NOT DEFINED PODOFO_BUILD_SHARED AND DEFINED PODOFO_BUILD_STATIC)
+ 
++IF(DEFINED LIB_SUFFIX)
++	SET(LIBDIRNAME "lib${LIB_SUFFIX}")
++ELSE(DEFINED LIB_SUFFIX)
++
+ # Some 64 bit linux distros use /usr/lib64 for 64 bit libraries.
+ # on these platforms we must
+ IF(NOT DEFINED WANT_LIB64)
+@@ -62,6 +66,8 @@
+ ELSE(WANT_LIB64)
+ 	SET(LIBDIRNAME "lib")
+ ENDIF(WANT_LIB64)
++
++ENDIF(DEFINED LIB_SUFFIX)
+ MESSAGE("Will install libraries to ${CMAKE_INSTALL_PREFIX}/${LIBDIRNAME}")
+ 
+ # Some headers that tend to vary a bit
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/podofo.git/commitdiff/1a3a170d25ab77ef000c643e7536e10144ca7de6



More information about the pld-cvs-commit mailing list