SPECS: bzip2.spec - release 17 - moved main so lib to /lib - STBR

baggins baggins at pld-linux.org
Mon Jun 20 01:16:10 CEST 2005


Author: baggins                      Date: Sun Jun 19 23:16:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 17
- moved main so lib to /lib
- STBR

---- Files affected:
SPECS:
   bzip2.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/bzip2.spec
diff -u SPECS/bzip2.spec:1.94 SPECS/bzip2.spec:1.95
--- SPECS/bzip2.spec:1.94	Sat Jun 18 12:08:06 2005
+++ SPECS/bzip2.spec	Mon Jun 20 01:16:05 2005
@@ -11,7 +11,7 @@
 Summary(ru):	ëĎÍĐŇĹÓÓĎŇ ĆÁĘĚĎ× ÎÁ ĎÓÎĎ×Ĺ ÁĚÇĎŇÉÔÍÁ ÂĚĎŢÎĎĘ ÓĎŇÔÉŇĎ×ËÉ
 Name:		bzip2
 Version:	1.0.2
-Release:	16.3
+Release:	17
 Epoch:		0
 License:	BSD-like
 Group:		Applications/Archiving
@@ -174,7 +174,8 @@
 %{__automake}
 %{__autoconf}
 %configure \
-    CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
+	--libdir=/%{_lib} \
+	CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
 %{__make}
 cd doc
 /usr/bin/texi2html bzip2.texi
@@ -182,6 +183,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -195,7 +197,12 @@
 
 # standard soname was libbz2.so.1.0, libtoolizeautoconf patch broke it,
 # but ABI has not changed - provide symlink for binary compatibility
-ln -sf libbz2.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libbz2.so.1.0
+ln -sf libbz2.so.1.0.0 $RPM_BUILD_ROOT/%{_lib}/libbz2.so.1.0
+
+mv $RPM_BUILD_ROOT/%{_lib}/lib*.{a,la,so} $RPM_BUILD_ROOT%{_libdir}/
+ln -sf /%{_lib}/libbz2.so.1.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so
+%{__sed} -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" \
+        $RPM_BUILD_ROOT%{_libdir}/libbz2.la
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -225,8 +232,8 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_libdir}/lib*.so.1.0
+%attr(755,root,root) /%{_lib}/lib*.so.*.*.*
+%attr(755,root,root) /%{_lib}/lib*.so.1.0
 
 %files static
 %defattr(644,root,root,755)
@@ -238,6 +245,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2005/06/19 23:16:05  baggins
+- release 17
+- moved main so lib to /lib
+- STBR
+
 Revision 1.94  2005/06/18 10:08:06  glen
 - bconded progressbar patch, outputs in some conditions uneccessary message when decopressing:
   "progress will only be shown when compressing files."
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bzip2.spec?r1=1.94&r2=1.95&f=u




More information about the pld-cvs-commit mailing list