SPECS: db3.spec - install in regular libdir

[qboosh]

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

---- Files affected:
SPECS:
   db3.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/db3.spec
diff -u SPECS/db3.spec:1.61 SPECS/db3.spec:1.62
--- SPECS/db3.spec:1.61	Fri Nov 18 20:11:37 2005
+++ SPECS/db3.spec	Fri Nov 18 20:22:08 2005
@@ -204,7 +204,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/lib}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}}
 
 cd build_unix.static
 
@@ -237,17 +237,13 @@
 #	install_dynamic_cxx \
 %endif
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libdb-*.so $RPM_BUILD_ROOT/lib
 # dunno if it's needed, but I think can help...
-ln -sf libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb-3.1.so
-ln -sf ../../lib/libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb.so
-ln -sf ../../lib/libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb3.so
-ln -sf ../../lib/libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb-3.3.so
-ln -sf libdb-3.3.a $RPM_BUILD_ROOT%{_libdir}/libdb-3.1.a
+ln -sf libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb.so
+ln -sf libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libdb3.so
 ln -sf libdb-3.3.a $RPM_BUILD_ROOT%{_libdir}/libdb3.a
 ln -sf libdb-3.3.a $RPM_BUILD_ROOT%{_libdir}/libdb.a
-ln -sf libdb3.so $RPM_BUILD_ROOT%{_libdir}/libndbm.so
-ln -sf libdb3.a $RPM_BUILD_ROOT%{_libdir}/libndbm.a
+ln -sf libdb-3.3.so $RPM_BUILD_ROOT%{_libdir}/libndbm.so
+ln -sf libdb-3.3.a $RPM_BUILD_ROOT%{_libdir}/libndbm.a
 
 OLDPWD=$(pwd); cd $RPM_BUILD_ROOT%{_libdir}
 for i in libdb*.la; do mv $i $i.old; done
@@ -285,7 +281,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
-%attr(755,root,root) /lib/libdb-*.so
+%attr(755,root,root) %{_libdir}/libdb-*.so
 
 %files utils
 %defattr(644,root,root,755)
@@ -318,12 +314,11 @@
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{api_cxx,api_c,ref,index.html,sleepycat,images} examples_{c,cxx}
-%{_libdir}/libdb*.la
 %attr(755,root,root) %{_libdir}/libdb.so
 %attr(755,root,root) %{_libdir}/libdb3.so
-%attr(755,root,root) %{_libdir}/libdb-3.?.so
 %attr(755,root,root) %{_libdir}/libndbm.so
 %attr(755,root,root) %{_libdir}/libdb_tcl.so
+%{_libdir}/libdb*.la
 #%attr(755,root,root) %{_libdir}/libdb_cxx*.so
 %{_includedir}/*
 
@@ -337,6 +332,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2005/11/18 19:22:08  qboosh
+- install in regular libdir
+
 Revision 1.61  2005/11/18 19:11:37  qboosh
 - updated URLs, strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db3.spec?r1=1.61&r2=1.62&f=u