[packages/libnsbmp] fix install on lib64 systems
glen
glen at pld-linux.org
Sat Apr 27 14:43:54 CEST 2013
commit b999dac6fc748cf69183444a93efcf65e18e3db4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 27 15:42:14 2013 +0300
fix install on lib64 systems
lib.patch | 12 ++++++++++++
libnsbmp.spec | 8 ++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/libnsbmp.spec b/libnsbmp.spec
index 3ac1143..a5a0d0e 100644
--- a/libnsbmp.spec
+++ b/libnsbmp.spec
@@ -10,6 +10,7 @@ License: MIT
Group: Libraries
Source0: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
# Source0-md5: 5b33ff44dfb48e628bcadbe7e51edf90
+Patch0: lib.patch
URL: http://www.netsurf-browser.org/projects/libnsbmp/
BuildRequires: netsurf-buildsystem
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,6 +48,7 @@ Statyczna biblioteka libnsbmp.
%prep
%setup -q
+%patch0 -p1
%build
CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
@@ -60,14 +62,16 @@ CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install Q='' \
- COMPONENT_TYPE=lib-shared \
+ lib=%{_lib} \
PREFIX=%{_prefix} \
+ COMPONENT_TYPE=lib-shared \
DESTDIR=$RPM_BUILD_ROOT
%if %{with static_libs}
%{__make} install Q='' \
- COMPONENT_TYPE=lib-static \
+ lib=%{_lib} \
PREFIX=%{_prefix} \
+ COMPONENT_TYPE=lib-static \
DESTDIR=$RPM_BUILD_ROOT
%endif
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 0000000..8448270
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,12 @@
+--- libnsbmp-0.1.0/Makefile~ 2013-04-19 22:07:55.000000000 +0300
++++ libnsbmp-0.1.0/Makefile 2013-04-27 15:41:11.408520862 +0300
+@@ -30,6 +30,7 @@
+
+ # Extra installation rules
+ I := /include/
++lib = lib
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsbmp.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/libnsbmp.git/commitdiff/b6d06bec0c727c56e2121682c19d729ca88dd56a
More information about the pld-cvs-commit
mailing list