SPECS (AC-branch): db.spec - simplified lib moving (just move libd...

[qboosh]

Author: qboosh                       Date: Wed Jun 22 10:47:28 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- simplified lib moving (just move libdb-4.2.so instead of moving all the rest
  and hacking *.la)

---- Files affected:
SPECS:
   db.spec (1.66.2.5 -> 1.66.2.6) 

---- Diffs:

================================================================
Index: SPECS/db.spec
diff -u SPECS/db.spec:1.66.2.5 SPECS/db.spec:1.66.2.6
--- SPECS/db.spec:1.66.2.5	Wed Jun 22 11:36:45 2005
+++ SPECS/db.spec	Wed Jun 22 12:47:23 2005
@@ -272,7 +272,7 @@
 
 ../dist/%configure \
 	--prefix=%{_prefix} \
-	--libdir=/%{_lib} \
+	--libdir=%{_libdir} \
 	--enable-compat185 \
 	--enable-rpc \
 	--%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
@@ -290,7 +290,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},%{_prefix}/%{_lib}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/%{_lib}}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
@@ -304,10 +304,9 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	LIB_INSTALL_FILE_LIST=""
 
-mv $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libdb_* $RPM_BUILD_ROOT%{_libdir}/
+mv $RPM_BUILD_ROOT%{_libdir}/libdb-4.2.so $RPM_BUILD_ROOT/%{_lib}
 
-cd $RPM_BUILD_ROOT/%{_libdir}
+cd $RPM_BUILD_ROOT%{_libdir}
 ln -sf /%{_lib}/libdb-4.2.so libdb.so
 ln -sf /%{_lib}/libdb-4.2.so libdb4.so
 ln -sf /%{_lib}/libdb-4.2.so libdb-4.so
@@ -318,12 +317,10 @@
 %if %{with java}
 ln -sf libdb_java-4.2.la libdb_java.la
 mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_java-4.2.la
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.2.so libdb_tcl.so
 ln -sf libdb_tcl-4.2.la libdb_tcl.la
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_tcl-4.2.la
 %endif
 ln -sf libdb_cxx-4.2.la libdb_cxx.la
 mv -f libdb.a libdb-4.2.a
@@ -338,9 +335,6 @@
 sed -i "s/old_library=''/old_library='libdb-4.2.a'/" libdb-4.2.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.2.a'/" libdb_cxx-4.2.la
 
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb-4.2.la
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_cxx-4.2.la
-
 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -467,6 +461,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66.2.6  2005/06/22 10:47:23  qboosh
+- simplified lib moving (just move libdb-4.2.so instead of moving all the rest
+  and hacking *.la)
+
 Revision 1.66.2.5  2005/06/22 09:36:45  qboosh
 - release 10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db.spec?r1=1.66.2.5&r2=1.66.2.6&f=u