[packages/libsvgtiny] fix install in lib64 systems

glen glen at pld-linux.org
Sat Apr 27 16:54:08 CEST 2013


commit 420228ae29f0170ab8dd7be025d0bc23426e08ef
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 17:53:57 2013 +0300

    fix install in lib64 systems

 lib.patch       | 13 +++++++++++++
 libsvgtiny.spec |  4 ++++
 2 files changed, 17 insertions(+)
---
diff --git a/libsvgtiny.spec b/libsvgtiny.spec
index 7e28f2b..6bc9538 100644
--- a/libsvgtiny.spec
+++ b/libsvgtiny.spec
@@ -10,6 +10,7 @@ License:	MIT
 Group:		Libraries
 Source0:	http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
 # Source0-md5:	b1da875a8cfa4e005bb74c6aac62baf1
+Patch0:		lib.patch
 URL:		http://www.netsurf-browser.org/projects/libsvgtiny/
 BuildRequires:	libdom-devel >= 0.0.1
 BuildRequires:	libwapcaplet-devel >= 0.2.0
@@ -53,6 +54,7 @@ Statyczna biblioteka libsvgtiny.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CC="%{__cc}"
@@ -72,12 +74,14 @@ export LDFLAGS="%{rpmldflags}"
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install Q= \
+	lib=%{_lib} \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-shared \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with static_libs}
 %{__make} install Q= \
+	lib=%{_lib} \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-static \
 	DESTDIR=$RPM_BUILD_ROOT
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 0000000..73bf8c5
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,13 @@
+--- libsvgtiny-0.1.0/Makefile~	2013-04-19 22:26:48.000000000 +0300
++++ libsvgtiny-0.1.0/Makefile	2013-04-27 17:53:19.066706553 +0300
+@@ -45,7 +45,8 @@
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
++lib := lib
+ I := /include
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h
+-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
+-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(lib)/pkgconfig:lib$(COMPONENT).pc.in
++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(lib):$(OUTPUT)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsvgtiny.git/commitdiff/420228ae29f0170ab8dd7be025d0bc23426e08ef



More information about the pld-cvs-commit mailing list