packages: ipe/ipe.spec, ipe/ipe-ipeletdir.patch (NEW)=?UTF-8?Q?=20?=- fixed build on x86_64

[megabajt]

Author: megabajt                     Date: Wed Feb 15 14:45:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build on x86_64

---- Files affected:
packages/ipe:
   ipe.spec (1.1 -> 1.2) , ipe-ipeletdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ipe/ipe.spec
diff -u packages/ipe/ipe.spec:1.1 packages/ipe/ipe.spec:1.2
--- packages/ipe/ipe.spec:1.1	Wed Feb 15 10:59:39 2012
+++ packages/ipe/ipe.spec	Wed Feb 15 15:45:10 2012
@@ -7,6 +7,7 @@
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ipe7/%{name}-%{version}-src.tar.gz
 # Source0-md5:	887f65359d60e184a446cbe77def5176
+Patch0:		%{name}-ipeletdir.patch
 URL:		http://ipe7.sourceforge.net/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
@@ -45,14 +46,16 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e 's/lua5.1/lua51/g' src/config.mak
 
 %build
 %{__make} -C src \
 	IPEPREFIX=%{_prefix} \
+	IPELIBDIR=%{_libdir} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcxxflags}" \
+	CXXFLAGS="%{rpmcxxflags} -fPIC" \
 	IPE_USE_ICONV="-DIPE_USE_ICONV"
 
 %install
@@ -60,7 +63,8 @@
 
 %{__make} -C src install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT \
-	IPEPREFIX=%{_prefix}
+	IPEPREFIX=%{_prefix} \
+	IPELIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/02/15 14:45:10  megabajt
+- fixed build on x86_64
+
 Revision 1.1  2012/02/15 09:59:39  megabajt
 - new
 

================================================================
Index: packages/ipe/ipe-ipeletdir.patch
diff -u /dev/null packages/ipe/ipe-ipeletdir.patch:1.1
--- /dev/null	Wed Feb 15 15:45:16 2012
+++ packages/ipe/ipe-ipeletdir.patch	Wed Feb 15 15:45:10 2012
@@ -0,0 +1,11 @@
+--- ipe-7.1.2/src/config.mak.orig	2012-02-15 14:45:19.047045221 +0100
++++ ipe-7.1.2/src/config.mak	2012-02-15 14:46:08.249274100 +0100
+@@ -137,7 +137,7 @@ IPELIBDIR  = $(IPEPREFIX)/lib
+ IPEHEADERDIR = $(IPEPREFIX)/include
+ #
+ # Where Ipelets will be installed:
+-IPELETDIR = $(IPEPREFIX)/lib/ipe/$(IPEVERS)/ipelets
++IPELETDIR = $(IPELIBDIR)/ipe/$(IPEVERS)/ipelets
+ #
+ # Where Lua code will be installed
+ # (This is the part of the Ipe program written in the Lua language)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipe/ipe.spec?r1=1.1&r2=1.2&f=u