[packages/libhubbub] fix install in lib64 systems, verbose files, package ghost soname symlink

glen glen at pld-linux.org
Sat Apr 27 16:04:07 CEST 2013


commit 6204307b3ea284cf1e489c898fc9392ead706936
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 17:03:47 2013 +0300

    fix install in lib64 systems, verbose files, package ghost soname symlink

 lib.patch      | 18 ++++++++++++++++++
 libhubbub.spec | 13 +++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/libhubbub.spec b/libhubbub.spec
index 0554aa4..1452547 100644
--- a/libhubbub.spec
+++ b/libhubbub.spec
@@ -10,6 +10,7 @@ License:	MIT
 Group:		Libraries
 Source0:	http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
 # Source0-md5:	625ea927b9134276d82960ab9bc03cb1
+Patch0:		lib.patch
 URL:		http://www.netsurf-browser.org/projects/libhubbub/
 BuildRequires:	libparserutils-devel >= 0.1.2
 BuildRequires:	netsurf-buildsystem
@@ -65,6 +66,7 @@ Statyczna biblioteka libhubbub.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CC="%{__cc}"
@@ -84,12 +86,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
@@ -103,16 +107,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libhubbub.so.*.*.*
+%ghost %{_libdir}/libhubbub.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/libhubbub.so
 %{_includedir}/hubbub
-%{_pkgconfigdir}/*pc
+%{_pkgconfigdir}/libhubbub.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libhubbub.a
 %endif
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 0000000..444f037
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,18 @@
+--- libhubbub-0.2.0/Makefile~	2013-04-19 21:48:41.000000000 +0300
++++ libhubbub-0.2.0/Makefile	2013-04-27 17:02:07.366422833 +0300
+@@ -61,6 +61,7 @@
+ endif
+ 
+ # Extra installation rules
++lib := lib
+ I := /include/hubbub
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
+@@ -68,5 +69,5 @@
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/parser.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/tree.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/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/libhubbub.git/commitdiff/6204307b3ea284cf1e489c898fc9392ead706936



More information about the pld-cvs-commit mailing list