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
This commit is contained in:
parent
0d7e97d09b
commit
11a4b72485
2 changed files with 18 additions and 3 deletions
|
@ -29,7 +29,7 @@ libumem_la_SOURCES = init_lib.c \
|
||||||
sys/vmem.h \
|
sys/vmem.h \
|
||||||
sys/vmem_impl_user.h
|
sys/vmem_impl_user.h
|
||||||
|
|
||||||
include_HEADERS = umem.h sys/vmem.h
|
nobase_include_HEADERS = umem.h sys/vmem.h
|
||||||
|
|
||||||
TESTS = umem_test
|
TESTS = umem_test
|
||||||
|
|
||||||
|
|
19
umem.spec
19
umem.spec
|
@ -36,15 +36,29 @@ and reclaming memory." (Description sourced from Wikipedia.)
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
%makeinstall
|
%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
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
|
%pre
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS COPYING COPYRIGHT INSTALL NEWS OPENSOLARIS.LICENSE README TODO
|
%doc AUTHORS COPYING COPYRIGHT INSTALL NEWS OPENSOLARIS.LICENSE README TODO
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so.*
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
|
@ -64,7 +78,8 @@ of Solaris's slab allocator, libumem, to Linux.
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_includedir}/*.h
|
%{_includedir}/*.h
|
||||||
%{_includedir}/sys/*.h
|
%{_includedir}/sys/*.h
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so
|
||||||
|
%{_libdir}/*.a
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
Loading…
Reference in a new issue