SPECS: bzip2.spec - simplified lib installation to /%{_lib} - unif...

[qboosh]

Author: qboosh                       Date: Mon Jun 20 21:52:07 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified lib installation to /%{_lib}
- unified: -libs before -devel

---- Files affected:
SPECS:
   bzip2.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: SPECS/bzip2.spec
diff -u SPECS/bzip2.spec:1.97 SPECS/bzip2.spec:1.98
--- SPECS/bzip2.spec:1.97	Mon Jun 20 18:29:00 2005
+++ SPECS/bzip2.spec	Mon Jun 20 23:52:01 2005
@@ -83,6 +83,28 @@
 ŇĎÚĐĎ×ÓŔÄÖĹÎŚ ËĎÍĐŇĹÓĎŇÉ ÎÁ ÂÁÚŚ LZ77/LZ78 Ś ÎÁÂĚÉÖÁ¤ÔŘÓŃ ÄĎ Ôϧ, ÝĎ
 §§ ÚÁÂĹÚĐĹŢŐ¤ ÓŚÍĹĘÓÔ×Ď ÓÔÁÔÉÓÔÉŢÎÉČ ËĎÍĐŇĹÓĎŇŚ× PPM.
 
+%package libs
+Summary:	libbz2 library
+Summary(fr):	Librairie libbz2
+Summary(pl):	Biblioteka libbz2
+Group:		Development/Libraries
+%ifarch %{x8664} ia64 ppc64 s390x sparc64
+Provides:	libbz2.so.1.0()(64bit)
+%else
+Provides:	libbz2.so.1.0
+%endif
+Obsoletes:	libbzip2
+Conflicts:	bzip2 < 0:1.0.2-12
+
+%description libs
+libbz2 library.
+
+%description libs -l fr
+Librairie libbz2.
+
+%description libs -l pl
+Biblioteka libbz2.
+
 %package devel
 Summary:	libbz2 library header files
 Summary(fr):	Fichiers d'en-tęte pour bzip2
@@ -112,28 +134,6 @@
 ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÂŚÂĚŚĎÔĹËŐ ÔÁ ČĹÄĹŇÉ, ÎĹĎÂČŚÄÎŚ ÄĚŃ ŇĎÚŇĎÂËÉ
 ĐŇĎÇŇÁÍ, ŃËŚ ×ËĚŔŢÁŔÔŘ ĐŚÄĐŇĎÇŇÁÍÉ ËĎÍĐŇĹÓŚ§/ÄĹËĎÍĐŇĹÓŚ§ bz2.
 
-%package libs
-Summary:	libbz2 library
-Summary(fr):	Librairie libbz2
-Summary(pl):	Biblioteka libbz2
-Group:		Development/Libraries
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:	libbz2.so.1.0()(64bit)
-%else
-Provides:	libbz2.so.1.0
-%endif
-Obsoletes:	libbzip2
-Conflicts:	bzip2 < 0:1.0.2-12
-
-%description libs
-libbz2 library.
-
-%description libs -l fr
-Librairie libbz2.
-
-%description libs -l pl
-Biblioteka libbz2.
-
 %package static
 Summary:	Static libbz2 library
 Summary(fr):	Librairie statique libbz2
@@ -175,7 +175,6 @@
 %{__automake}
 %{__autoconf}
 %configure \
-	--libdir=/%{_lib} \
 	CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
 %{__make}
 cd doc
@@ -184,7 +183,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -196,22 +195,20 @@
 	$RPM_BUILD_ROOT%{_bindir}/bzless
 rm -f $RPM_BUILD_ROOT%{_bindir}/bzless.tmp
 
+mv -f $RPM_BUILD_ROOT%{_libdir}/libbz2.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/libbz2.so.1.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so
+
 # 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/%{_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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs	-p /sbin/ldconfig
-%postun libs	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -225,17 +222,17 @@
 %lang(ko) %{_mandir}/ko/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/lib*.so.*.*.*
+%attr(755,root,root) /%{_lib}/lib*.so.1.0
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/*.h
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/lib*.so.*.*.*
-%attr(755,root,root) /%{_lib}/lib*.so.1.0
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
@@ -246,6 +243,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2005/06/20 21:52:01  qboosh
+- simplified lib installation to /%{_lib}
+- unified: -libs before -devel
+
 Revision 1.97  2005/06/20 16:29:00  blekot
 - up to 1.0.3
 - TODO done
================================================================

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