SPECS: libpreludedb.spec - no static plugins, restored .la for sha...

[qboosh]

Author: qboosh                       Date: Sun Jan 14 19:51:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no static plugins, restored .la for shared lib(s)

---- Files affected:
SPECS:
   libpreludedb.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/libpreludedb.spec
diff -u SPECS/libpreludedb.spec:1.9 SPECS/libpreludedb.spec:1.10
--- SPECS/libpreludedb.spec:1.9	Tue Jan  9 14:21:34 2007
+++ SPECS/libpreludedb.spec	Sun Jan 14 20:51:14 2007
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	perl
-%bcond_without	python		# needed by prewikka
-%bcond_without	postgresql	# 
-%bcond_without	mysql		# one from those is needed by prewikka
-%bcond_without	sqlite3		# 
+%bcond_without	perl		# don't build perl bindings
+%bcond_without	python		# don't build python bindings (needed by prewikka)
+%bcond_without	postgresql	# don't build postgresql plugin
+%bcond_without	mysql		# don't build mysql plugin
+%bcond_without	sqlite3		# don't build sqlite3 plugin
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	The PreludeDB Library
@@ -166,8 +166,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# are generating wrong dependencies (and are not needed anyway)
-find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \;
+# *.la are generating wrong dependencies (and are not needed anyway)
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.{la,a}
 
 %if %{with perl}
 cd bindings/perl && %{__perl} Makefile.PL \
@@ -197,10 +197,8 @@
 EOF
 fi
 
-%postun
-
-%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)
@@ -220,19 +218,30 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/classic
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/libpreludedb-config
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_includedir}/libpreludedb
+%{_aclocaldir}/*.m4
+%{_gtkdocdir}/libpreludedb
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+
 %if %{with postgresql}
 %files pgsql
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/plugins/sql/*pgsql*
-%exclude %{_libdir}/%{name}/plugins/sql/*pgsql*.a
+%attr(755,root,root) %{_libdir}/%{name}/plugins/sql/*pgsql*.so
 %{_datadir}/%{name}/classic/*pgsql*
 %endif
 
 %if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/plugins/sql/*mysql*
-%exclude %{_libdir}/%{name}/plugins/sql/*mysql*.a
+%attr(755,root,root) %{_libdir}/%{name}/plugins/sql/*mysql*.so
 %{_datadir}/%{name}/classic/*mysql*
 %exclude %{_datadir}/%{name}/classic/mysql2pgsql.sh
 %exclude %{_datadir}/%{name}/classic/mysql2sqlite.sh
@@ -241,24 +250,10 @@
 %if %{with sqlite3}
 %files sqlite3
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/plugins/sql/*sqlite*
-%exclude %{_libdir}/%{name}/plugins/sql/*sqlite*.a
+%attr(755,root,root) %{_libdir}/%{name}/plugins/sql/*sqlite*.so
 %{_datadir}/%{name}/classic/*sqlite*
 %endif
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libpreludedb-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/libpreludedb
-%{_aclocaldir}/*.m4
-%{_gtkdocdir}/libpreludedb
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
-%{_libdir}/%{name}/plugins/*/*.a
-
 %if %{with perl}
 %files -n perl-libpreludedb
 %defattr(644,root,root,755)
@@ -281,6 +276,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/01/14 19:51:14  qboosh
+- no static plugins, restored .la for shared lib(s)
+
 Revision 1.9  2007/01/09 13:21:34  alucard
 - unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libpreludedb.spec?r1=1.9&r2=1.10&f=u