[packages/libnsfb] fix lib64 systems install; verbose files; ghost soname symlink
glen
glen at pld-linux.org
Sat Apr 27 16:49:46 CEST 2013
commit 26f03ce4ac54279bd500a0cbcde4f85e2d3242fa
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 27 17:49:27 2013 +0300
fix lib64 systems install; verbose files; ghost soname symlink
lib.patch | 17 +++++++++++++++++
libnsfb.spec | 15 ++++++++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/libnsfb.spec b/libnsfb.spec
index 17debe3..45725c4 100644
--- a/libnsfb.spec
+++ b/libnsfb.spec
@@ -11,6 +11,7 @@ Group: Libraries
Source0: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
# Source0-md5: 686a4d2064edfed47d2653588c3b5512
Patch0: %{name}-link.patch
+Patch1: lib.patch
URL: http://www.netsurf-browser.org/projects/libnsfb/
BuildRequires: SDL-devel
BuildRequires: libvncserver-devel
@@ -67,6 +68,7 @@ Statyczna biblioteka libnsfb.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CC="%{__cc}"
@@ -85,12 +87,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
@@ -104,16 +108,17 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnsfb.so.*.*.*
+%ghost %{_libdir}/libnsfb.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*.h
-%{_pkgconfigdir}/*pc
+%{_libdir}/libnsfb.so
+%{_includedir}/libnsfb*.h
+%{_pkgconfigdir}/libnsfb.pc
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libnsfb.a
%endif
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 0000000..e178684
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,17 @@
+--- libnsfb-0.1.0/Makefile~ 2013-04-27 17:46:15.000000000 +0300
++++ libnsfb-0.1.0/Makefile 2013-04-27 17:47:10.907357377 +0300
+@@ -98,11 +98,12 @@
+ include $(NSBUILD)/Makefile.top
+
+ # Extra installation rules
++lib := lib
+ I := /include
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot_util.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_event.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_cursor.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/libnsfb.git/commitdiff/26f03ce4ac54279bd500a0cbcde4f85e2d3242fa
More information about the pld-cvs-commit
mailing list