commit d999489dc33ef2ab44c08ec8265e5f748b13f7f6
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 27 16:44:16 2013 +0300
fix install on lib64 systems
lib.patch | 18 ++++++++++++++++++
libCSS.spec | 24 +++++++++++++-----------
2 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/libCSS.spec b/libCSS.spec
index 05736ac..e9e0e5c 100644
--- a/libCSS.spec
+++ b/libCSS.spec
@@ -1,8 +1,9 @@
+# TODO:
+# - avoid compilation in the install stage
#
-# TODO: avoid compilation in the install stage
# Conditional build:
%bcond_without static_libs # don't build static library
-#
+
Summary: CSS parser and selection engine
Name: libCSS
Version: 0.2.0
@@ -11,20 +12,23 @@ License: MIT
Group: Libraries
Source0:
http://download.netsurf-browser.org/libs/releases/libcss-%{version}-src.tar.gz
# Source0-md5: e61700e0dce2a122d65b85dba04c4b40
+Patch0: lib.patch
URL: http://www.netsurf-browser.org/projects/libcss/
BuildRequires: libparserutils-devel >= 0.1.2
BuildRequires: libwapcaplet-devel >= 0.2.0
BuildRequires: netsurf-buildsystem
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# broken linking
+%define no_install_post_check_so 1
+
%description
LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
written in C. It was developed as part of the NetSurf project and is
available for use by other software under the MIT licence. For further
details, see the readme.
-Features
-
+Features:
- Parses CSS, good and bad
- Simple C API
- Low memory usage
@@ -60,6 +64,7 @@ Statyczna biblioteka libCSS.
%prep
%setup -q -n libcss-%{version}
+%patch0 -p1
%build
%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
@@ -71,19 +76,16 @@ Statyczna biblioteka libCSS.
%install
rm -rf $RPM_BUILD_ROOT
-
-%{__make} -j1 install \
- DESTDIR=$RPM_BUILD_ROOT \
+%{__make} -j1 install Q='' \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-shared \
- Q=''
+ DESTDIR=$RPM_BUILD_ROOT
%if %{with static_libs}
-%{__make} -j1 install \
- DESTDIR=$RPM_BUILD_ROOT \
+%{__make} -j1 install Q='' \
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..63ecae7
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,18 @@
+--- libcss-0.2.0/Makefile~ 2013-04-19 21:40:31.000000000 +0300
++++ libcss-0.2.0/Makefile 2013-04-27 16:42:38.688935442 +0300
+@@ -44,6 +44,7 @@
+ include $(NSBUILD)/Makefile.top
+
+ # Extra installation rules
++lib := lib
+ I := /include/libcss
+
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
+@@ -57,5 +58,5 @@
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/select.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/stylesheet.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/types.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/libCSS.git/commitdiff/d999489dc33ef2ab44c08ec8265e5f748b13f7f6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
