[packages/libnsgif] fix install on lib64 systems
glen
glen at pld-linux.org
Sat Apr 27 14:38:53 CEST 2013
commit c1cc6538896674b5497a8dc08a79be2739b8d37a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 27 15:38:38 2013 +0300
fix install on lib64 systems
lib.patch | 12 ++++++++++++
libnsgif.spec | 4 ++++
2 files changed, 16 insertions(+)
---
diff --git a/libnsgif.spec b/libnsgif.spec
index 2908e61..521b380 100644
--- a/libnsgif.spec
+++ b/libnsgif.spec
@@ -10,6 +10,7 @@ License: MIT
Group: Libraries
Source0: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
# Source0-md5: f3d4295be77db30da1f4167b270bb4d9
+Patch0: lib.patch
URL: http://www.netsurf-browser.org/projects/libnsgif/
BuildRequires: netsurf-buildsystem
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,6 +48,7 @@ Statyczna biblioteka libnsgif.
%prep
%setup -q
+%patch0 -p1
%build
CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
@@ -60,12 +62,14 @@ CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
+ lib=%{_lib} \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-shared \
DESTDIR=$RPM_BUILD_ROOT
%if %{with static_libs}
%{__make} install \
+ 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..d833198
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,12 @@
+--- libnsgif-0.1.0/Makefile~ 2013-04-19 22:32:57.000000000 +0300
++++ libnsgif-0.1.0/Makefile 2013-04-27 15:35:27.323556353 +0300
+@@ -30,6 +30,7 @@
+
+ # Extra installation rules
+ I := /include
++lib = lib
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsgif.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/libnsgif.git/commitdiff/c1cc6538896674b5497a8dc08a79be2739b8d37a
More information about the pld-cvs-commit
mailing list