Author: qboosh Date: Mon Oct 30 12:11:46 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - move libs without breaking *.la; release 4
---- Files affected: SPECS: reiser4progs.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/reiser4progs.spec diff -u SPECS/reiser4progs.spec:1.26 SPECS/reiser4progs.spec:1.27 --- SPECS/reiser4progs.spec:1.26 Thu Oct 19 22:26:14 2006 +++ SPECS/reiser4progs.spec Mon Oct 30 13:11:41 2006 @@ -6,7 +6,7 @@ Summary(uk): őÔÉĚŚÔÉ ÄĚŃ ŇĎÂĎÔŮ Ú ĆÁĘĚĎ×ĎŔ ÓÉÓÔĹÍĎŔ Reiser4 Name: reiser4progs Version: 1.0.5 -Release: 3 +Release: 4 License: GPL v2 Group: Applications/System Source0: ftp://ftp.namesys.com/pub/reiser4progs/%{name}-%{version}.tar.gz @@ -98,8 +98,6 @@ %{__autoconf} %{__automake} %configure \ - --libdir=/%{_lib} \ - --libexecdir=/%{_lib} \ %{!?debug:--disable-debug} %{__make} @@ -110,9 +108,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -for f in `ls $RPM_BUILD_ROOT/%{_lib}/*.*a`; do - mv $f $RPM_BUILD_ROOT%{_libdir} -done +install -d $RPM_BUILD_ROOT/%{_lib} +mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib} for f in libreiser4 libreiser4-minimal librepair; do lib=$(cd $RPM_BUILD_ROOT/%{_lib}; echo $f-1.0.so.*.*.*) ln -sf /%{_lib}/$lib $RPM_BUILD_ROOT%{_libdir}/$f.so @@ -121,27 +118,36 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(644,root,root,755) # COPYING contains information other than GPL text %doc AUTHORS BUGS COPYING CREDITS ChangeLog NEWS README THANKS TODO %attr(755,root,root) %{_sbindir}/* -%attr(755,root,root) /%{_lib}/lib*.so.*.*.* +%attr(755,root,root) /%{_lib}/libreiser4-1.0.so.*.*.* +%attr(755,root,root) /%{_lib}/libreiser4-minimal-1.0.so.*.*.* +%attr(755,root,root) /%{_lib}/librepair-1.0.so.*.*.* %{_mandir}/man*/* %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la -%{_includedir}/* -%{_aclocaldir}/*.m4 +%attr(755,root,root) %{_libdir}/libreiser4.so +%attr(755,root,root) %{_libdir}/libreiser4-minimal.so +%attr(755,root,root) %{_libdir}/librepair.so +%{_libdir}/libreiser4.la +%{_libdir}/libreiser4-minimal.la +%{_libdir}/librepair.la +%{_includedir}/reiser4 +%{_includedir}/repair +%{_aclocaldir}/libreiser4.m4 %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libreiser4.a +%{_libdir}/libreiser4-minimal.a +%{_libdir}/librepair.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -149,6 +155,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2006/10/30 12:11:41 qboosh +- move libs without breaking *.la; release 4 + Revision 1.26 2006/10/19 20:26:14 pluto - put devel stuff into %{_libdir}. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/reiser4progs.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
