commit f8802bedd68270b473b03624e938844318ffc9d1
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 27 15:45:54 2013 +0300
fix install on lib64 systems
lib.patch | 12 ++++++++++++
libwapcaplet.spec | 21 +++++++++++----------
2 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/libwapcaplet.spec b/libwapcaplet.spec
index f467d74..6b9d9d0 100644
--- a/libwapcaplet.spec
+++ b/libwapcaplet.spec
@@ -1,7 +1,7 @@
#
# Conditional build:
%bcond_without static_libs # don't build static library
-#
+
Summary: String internment library
Name: libwapcaplet
Version: 0.2.0
@@ -10,6 +10,7 @@ License: MIT
Group: Libraries
Source0:
http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
# Source0-md5: 9e0d838365e72d67723c96e0d315f73a
+Patch0: lib.patch
URL: http://www.netsurf-browser.org/projects/libwapcaplet/
BuildRequires: netsurf-buildsystem
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,8 +32,8 @@ This is the libraries, include files and other resources you
can use
to incorporate libwapcaplet into applications.
%description devel -l pl.UTF-8
-Pliki nagłówkowe pozwalające na używanie biblioteki libwapcaplet
-w swoich programach.
+Pliki nagłówkowe pozwalające na używanie biblioteki libwapcaplet w
+swoich programach.
%package static
Summary: libwapcaplet static libraries
@@ -48,6 +49,7 @@ Statyczna biblioteka libwapcaplet.
%prep
%setup -q
+%patch0 -p1
%build
%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
@@ -59,19 +61,18 @@ Statyczna biblioteka libwapcaplet.
%install
rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q='' \
+ lib=%{_lib} \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-shared \
- Q=''
+ DESTDIR=$RPM_BUILD_ROOT \
%if %{with static_libs}
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q='' \
+ lib=%{_lib} \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-static \
- Q=''
+ DESTDIR=$RPM_BUILD_ROOT
%endif
%clean
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 0000000..de71223
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,12 @@
+--- libwapcaplet-0.2.0/Makefile~ 2013-04-19 20:52:56.000000000 +0300
++++ libwapcaplet-0.2.0/Makefile 2013-04-27 15:44:41.144316739 +0300
+@@ -42,6 +42,7 @@
+
+ # Extra installation rules
+ I := /include/libwapcaplet
++lib = lib
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.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/libwapcaplet.git/commitdiff/f8802bedd68270b473b03624e938844318ffc9d1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
