SPECS: db2.spec - install in regular libdir

[qboosh]

Author: qboosh                       Date: Fri Nov 18 19:19:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install in regular libdir

---- Files affected:
SPECS:
   db2.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/db2.spec
diff -u SPECS/db2.spec:1.20 SPECS/db2.spec:1.21
--- SPECS/db2.spec:1.20	Fri Nov 18 20:11:37 2005
+++ SPECS/db2.spec	Fri Nov 18 20:19:00 2005
@@ -16,10 +16,10 @@
 Patch0:		%{name}-glibc-2.1.3.patch
 Patch1:		%{name}-libdb2.patch
 URL:		http://www.sleepycat.com/
-Conflicts:	glibc < 2.1.90
 BuildConflicts:	glibc-db2
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	glibc-db2
+Conflicts:	glibc < 2.1.90
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -37,8 +37,8 @@
 Summary(pl):	Pliki nagłówkowe do biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Conflicts:	glibc-devel < 2.1.90
 Obsoletes:	glibc-db2-devel
+Conflicts:	glibc-devel < 2.1.90
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -63,8 +63,8 @@
 Summary(pl):	Statyczne biblioteki Berkeley Database
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Conflicts:	glibc-static < 2.1.90
 Obsoletes:	glibc-db2-static
+Conflicts:	glibc-static < 2.1.90
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -90,13 +90,14 @@
 %patch1 -p1
 
 %build
-%{__make} CFLAGS="%{rpmcflags} -I. -I./include -include ./compat.h"
+%{__make} \
+	CFLAGS="%{rpmcflags} -I. -I./include -include ./compat.h"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/lib,%{_includedir}/db2,%{_libdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_includedir}/db2,%{_libdir},%{_bindir}}
 
-install libdb2.so.3 $RPM_BUILD_ROOT/lib/
+install libdb2.so.3 $RPM_BUILD_ROOT%{_libdir}
 install libdb2.a $RPM_BUILD_ROOT%{_libdir}
 install db.h db_185.h $RPM_BUILD_ROOT%{_includedir}/db2
 
@@ -106,7 +107,7 @@
 		install $p $RPM_BUILD_ROOT%{_bindir}/$q
 done
 
-ln -sf ../../lib/libdb2.so.3 $RPM_BUILD_ROOT%{_libdir}/libdb2.so
+ln -sf libdb2.so.3 $RPM_BUILD_ROOT%{_libdir}/libdb2.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,14 +118,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README LICENSE
-%attr(755,root,root) /lib/libdb2.so.3
+%attr(755,root,root) %{_libdir}/libdb2.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/db2
-%{_includedir}/db2/db.h
-%{_includedir}/db2/db_185.h
-%attr(755,root,root) %{_libdir}/libdb2.so
 %attr(755,root,root) %{_bindir}/db2_archive
 %attr(755,root,root) %{_bindir}/db2_checkpoint
 %attr(755,root,root) %{_bindir}/db2_deadlock
@@ -133,6 +130,10 @@
 %attr(755,root,root) %{_bindir}/db2_printlog
 %attr(755,root,root) %{_bindir}/db2_recover
 %attr(755,root,root) %{_bindir}/db2_stat
+%attr(755,root,root) %{_libdir}/libdb2.so
+%dir %{_includedir}/db2
+%{_includedir}/db2/db.h
+%{_includedir}/db2/db_185.h
 
 %files static
 %defattr(644,root,root,755)
@@ -144,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2005/11/18 19:19:00  qboosh
+- install in regular libdir
+
 Revision 1.20  2005/11/18 19:11:37  qboosh
 - updated URLs, strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db2.spec?r1=1.20&r2=1.21&f=u