Author: arekm Date: Sat Jan 6 20:26:11 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - up from Tomasz Rutkowski
---- Files affected: SPECS: libprelude.spec (1.10 -> 1.11) , libpreludedb.spec (1.6 -> 1.7) , prelude-lml.spec (1.11 -> 1.12) , prelude-manager.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/libprelude.spec diff -u SPECS/libprelude.spec:1.10 SPECS/libprelude.spec:1.11 --- SPECS/libprelude.spec:1.10 Fri Jan 5 18:57:19 2007 +++ SPECS/libprelude.spec Sat Jan 6 21:26:05 2007 @@ -7,7 +7,7 @@ Summary(pl): Biblioteka Prelude Name: libprelude Version: 0.9.12 -Release: 1 +Release: 2 License: GPL Group: Libraries Source0: http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz @@ -126,6 +126,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# are generating wrong dependencies (and are not needed anyway) +find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \; + %if %{with perl} cd bindings/perl && %{__perl} Makefile.PL \ INSTALLDIRS=vendor @@ -157,8 +160,6 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/prelude-adduser %attr(755,root,root) %{_libdir}/lib*.so.*.* -# needed in normal operational -%{_libdir}/lib*.la %files devel %defattr(644,root,root,755) @@ -194,6 +195,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2007/01/06 20:26:05 arekm +- up from Tomasz Rutkowski + Revision 1.10 2007/01/05 17:57:19 arekm - up to 0.9.12 by Tomasz Rutkowski ================================================================ Index: SPECS/libpreludedb.spec diff -u SPECS/libpreludedb.spec:1.6 SPECS/libpreludedb.spec:1.7 --- SPECS/libpreludedb.spec:1.6 Fri Jan 5 18:58:07 2007 +++ SPECS/libpreludedb.spec Sat Jan 6 21:26:05 2007 @@ -11,7 +11,7 @@ Summary(pl): Biblioteka PreludeDB Name: libpreludedb Version: 0.9.11 -Release: 1 +Release: 2 License: GPL Group: Libraries Source0: http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz @@ -57,43 +57,43 @@ %description libs -l pl Biblioteka libpreludedb -%package db-pgsql +%package pgsql Summary: PostgreSQL backend for libpreludedb Summary(pl): Interfejs do PostgreSQL dla libpreludedb Group: Libraries Requires: %{name} = %{version}-%{release} Provides: %{name}(DB_driver) = %{version}-%{release} -%description db-pgsql +%description pgsql PostgreSQL backend for libpreludedb -%description db-pgsql -l pl +%description pgsql -l pl Interfejs do PostgreSQL do libpreludedb -%package db-mysql +%package mysql Summary: MySQL backend for libpreludedb Summary(pl): Interfejs do MySQL dla libpreludedb Group: Libraries Requires: %{name} = %{version}-%{release} Provides: %{name}(DB_driver) = %{version}-%{release} -%description db-mysql +%description mysql MySQL backend for libpreludedb -%description db-mysql -l pl +%description mysql -l pl Interfejs do MySQL do libpreludedb -%package db-sqlite3 +%package sqlite3 Summary: SQLite3 backend for libpreludedb Summary(pl): Interfejs do SQLite3 dla libpreludedb Group: Libraries Requires: %{name} = %{version}-%{release} Provides: %{name}(DB_driver) = %{version}-%{release} -%description db-sqlite3 +%description sqlite3 SQLite3 backend for libpreludedb -%description db-sqlite3 -l pl +%description sqlite3 -l pl Interfejs do SQLite3 do libpreludedb %package devel @@ -165,6 +165,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# are generating wrong dependencies (and are not needed anyway) +find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \; + %if %{with perl} cd bindings/perl && %{__perl} Makefile.PL \ INSTALLDIRS=vendor @@ -198,15 +201,6 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post db-pgsql -p /sbin/ldconfig -%postun db-pgsql -p /sbin/ldconfig - -%post db-mysql -p /sbin/ldconfig -%postun db-mysql -p /sbin/ldconfig - -%post db-sqlite3 -p /sbin/ldconfig -%postun db-sqlite3 -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README @@ -220,30 +214,32 @@ %dir %{_libdir}/%{name}/plugins/formats %dir %{_libdir}/%{name}/plugins/sql %attr(755,root,root) %{_libdir}/%{name}/plugins/formats/*.so -# needed for normal operational -%{_libdir}/%{name}/plugins/formats/*.la -%{_libdir}/lib*.la %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/classic %if %{with postgresql} -%files db-pgsql +%files pgsql %defattr(644,root,root,755) -%dir %{_libdir}/%{name}/plugins/sql/*pgsql* +%{_libdir}/%{name}/plugins/sql/*pgsql* +%exclude %{_libdir}/%{name}/plugins/sql/*pgsql*.a %{_datadir}/%{name}/classic/*pgsql* %endif %if %{with mysql} -%files db-mysql +%files mysql %defattr(644,root,root,755) -%dir %{_libdir}/%{name}/plugins/sql/*mysql* +%{_libdir}/%{name}/plugins/sql/*mysql* +%exclude %{_libdir}/%{name}/plugins/sql/*mysql*.a %{_datadir}/%{name}/classic/*mysql* +%exclude %{_datadir}/%{name}/classic/mysql2pgsql.sh +%exclude %{_datadir}/%{name}/classic/mysql2sqlite.sh %endif %if %{with sqlite3} -%files db-sqlite3 +%files sqlite3 %defattr(644,root,root,755) -%dir %{_libdir}/%{name}/plugins/sql/*sqlite* +%{_libdir}/%{name}/plugins/sql/*sqlite* +%exclude %{_libdir}/%{name}/plugins/sql/*sqlite*.a %{_datadir}/%{name}/classic/*sqlite* %endif @@ -273,7 +269,7 @@ %files -n python-libpreludedb %defattr(644,root,root,755) %attr(755,root,root) %{py_sitedir}/*.so - %{py_sitedir}/*.py[co] +%{py_sitedir}/*.py[co] %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -282,6 +278,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2007/01/06 20:26:05 arekm +- up from Tomasz Rutkowski + Revision 1.6 2007/01/05 17:58:07 arekm - up to 0.9.11 by Tomasz Rutkowski ================================================================ Index: SPECS/prelude-lml.spec diff -u SPECS/prelude-lml.spec:1.11 SPECS/prelude-lml.spec:1.12 --- SPECS/prelude-lml.spec:1.11 Fri Jan 5 18:58:54 2007 +++ SPECS/prelude-lml.spec Sat Jan 6 21:26:05 2007 @@ -6,7 +6,7 @@ Summary(pl): System wykrywania intruzów w sieci Name: prelude-lml Version: 0.9.8.1 -Release: 1 +Release: 2 License: GPL Group: Applications Source0: http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz @@ -86,6 +86,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# are generating wrong dependencies (and are not needed anyway) +find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \; + install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} @@ -119,14 +122,13 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %dir %{_sysconfdir}/%{name} %dir /var/lib/%{name} -%{_sysconfdir}/%{name}/ruleset %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.* +%{_sysconfdir}/%{name}/ruleset %files libs %defattr(644,root,root,755) %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/*.so -%{_libdir}/%{name}/*.la %files static %defattr(644,root,root,755) @@ -142,6 +144,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2007/01/06 20:26:05 arekm +- up from Tomasz Rutkowski + Revision 1.11 2007/01/05 17:58:54 arekm - up to 0.9.8.1 by Tomasz Rutkowski ================================================================ Index: SPECS/prelude-manager.spec diff -u SPECS/prelude-manager.spec:1.9 SPECS/prelude-manager.spec:1.10 --- SPECS/prelude-manager.spec:1.9 Fri Jan 5 19:01:32 2007 +++ SPECS/prelude-manager.spec Sat Jan 6 21:26:05 2007 @@ -10,7 +10,7 @@ Summary(pl): System do wykrywania intruzów w sieci Name: prelude-manager Version: 0.9.7.1 -Release: 1 +Release: 2 License: GPL Group: Applications Source0: http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz @@ -103,9 +103,9 @@ %configure \ --enable-shared \ --enable-static \ - --with-libwrap%{!?with_tcp_wrappers:=no} \ - --with-libpreludedb%{!?with_sql:=no} \ - --with-xml%{!?with_xml:=no} + --with%{!?with_tcp_wrappers:out}-libwrap \ + --with%{!?with_sql:out}-libpreludedb \ + --with%{!?with_xml:out}-xml %{__make} %install @@ -116,6 +116,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# are generating wrong dependencies (and are not needed anyway) +find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \; + install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} @@ -163,19 +166,16 @@ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/* %attr(755,root,root) %{_libdir}/%{name}/*/*.so -%{_libdir}/%{name}/*/*.la %exclude %{_libdir}/%{name}/reports/db.* %exclude %{_libdir}/%{name}/reports/xmlmod.* %files xml %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/reports/xmlmod.so -%{_libdir}/%{name}/reports/xmlmod.la %files sql %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/reports/db.so -%{_libdir}/%{name}/reports/db.la %files static %defattr(644,root,root,755) @@ -191,6 +191,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2007/01/06 20:26:05 arekm +- up from Tomasz Rutkowski + Revision 1.9 2007/01/05 18:01:32 arekm - update to 0.9.7.1 by Tomasz Rutkowski ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libprelude.spec?r1=1.10&r2=1.11&f=u http://cvs.pld-linux.org/SPECS/libpreludedb.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/prelude-lml.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/prelude-manager.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
