summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichdawe <richdawe@1665872d-e22b-0410-9e5d-a57ad4215e6d>2006-03-12 18:23:52 +0000
committerrichdawe <richdawe@1665872d-e22b-0410-9e5d-a57ad4215e6d>2006-03-12 18:23:52 +0000
commitf1fea7b8cbc33d7ba657ecdbca8aaeb5d37e304c (patch)
tree3cb0738929feacd0328cb059b29829d3e1766f1c
parentd59cc23ddd8749ace266991f5f60284ecbdc6ec0 (diff)
downloadportableumem-f1fea7b8cbc33d7ba657ecdbca8aaeb5d37e304c.tar.gz
Bugfixes: install headers in correct place; include .so in -devel, not main rpm; run ldconfig on pre/post in rpm; clean out libtool files in rpm build
git-svn-id: https://labs.omniti.com/portableumem/trunk@13 1665872d-e22b-0410-9e5d-a57ad4215e6d
-rw-r--r--Makefile.am2
-rw-r--r--umem.spec19
2 files changed, 18 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 762f696..4085ac4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ libumem_la_SOURCES = init_lib.c \
sys/vmem.h \
sys/vmem_impl_user.h
-include_HEADERS = umem.h sys/vmem.h
+nobase_include_HEADERS = umem.h sys/vmem.h
TESTS = umem_test
diff --git a/umem.spec b/umem.spec
index 07c4a5b..8a593bf 100644
--- a/umem.spec
+++ b/umem.spec
@@ -36,15 +36,29 @@ and reclaming memory." (Description sourced from Wikipedia.)
rm -rf $RPM_BUILD_ROOT
%makeinstall
+# Remove the libtool files -- we don't want them.
+find $RPM_BUILD_ROOT%{_libdir} -name '*.la' | xargs rm -fv
+
+# Remove the symlink to the SONAME. Let ldconfig manage that.
+rm -fv $RPM_BUILD_ROOT%{_libdir}/*.so.[0-9]
+
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+/sbin/ldconfig
+
+
+%post
+/sbin/ldconfig
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYRIGHT INSTALL NEWS OPENSOLARIS.LICENSE README TODO
-%{_libdir}/*.so
+%{_libdir}/*.so.*
%package devel
@@ -64,7 +78,8 @@ of Solaris's slab allocator, libumem, to Linux.
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_includedir}/sys/*.h
-%{_libdir}/*.so.*
+%{_libdir}/*.so
+%{_libdir}/*.a
%changelog