packages: syslog-ng/syslog-ng.spec - eeh, afsocket is required even for uni...

[qboosh]

Author: qboosh                       Date: Fri Nov 11 20:42:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- eeh, afsocket is required even for unix() sources, so merged back into base
- dbparser likewise, required by SCL

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.226 -> 1.227) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.226 packages/syslog-ng/syslog-ng.spec:1.227
--- packages/syslog-ng/syslog-ng.spec:1.226	Fri Nov 11 18:32:43 2011
+++ packages/syslog-ng/syslog-ng.spec	Fri Nov 11 21:42:00 2011
@@ -79,7 +79,13 @@
 Requires:	pcre >= 6.1
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.3.0
+# for afsocket
+Requires:	libnet >= 1:1.1.2.1-7
+# for afsocket and dbparser
+Requires:	openssl >= 0.9.8
 Provides:	syslogdaemon
+Obsoletes:	syslog-ng-module-afsocket
+Obsoletes:	syslog-ng-module-dbparser
 Conflicts:	klogd
 Conflicts:	msyslog
 Conflicts:	syslog
@@ -149,22 +155,6 @@
 %description module-afmongodb -l pl.UTF-8
 Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB.
 
-%package module-afsocket
-Summary:	Socket based transports support module for syslog-ng
-Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi transportów opartych na gniazdach
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	libnet >= 1:1.1.2.1-7
-Requires:	openssl >= 0.9.8
-
-%description module-afsocket
-Socket based transports (such as udp(), tcp(), syslog() drivers)
-support module for syslog-ng.
-
-%description module-afsocket -l pl.UTF-8
-Moduł sysloga-ng do obsługi transportów opartych na gniazdach (takich
-jak sterowniki udp(), tcp(), syslog()).
-
 %package module-afsql
 Summary:	SQL destination support module for syslog-ng
 Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi zapisu logów w bazach SQL
@@ -180,19 +170,6 @@
 Moduł sysloga-ng do obsługi zapisu logów w bazach SQL (poprzez
 libdbi).
 
-%package module-dbparser
-Summary:	Sample database based parsing support module for syslog-ng
-Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi analizy opartej na bazie danych
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	openssl >= 0.9.8
-
-%description module-dbparser
-Sample database based parsing support module for syslog-ng.
-
-%description module-dbparser -l pl.UTF-8
-Moduł sysloga-ng do obsługi analizy opartej na bazie danych.
-
 %package module-tfjson
 Summary:	JSON formatting template function for syslog-ng
 Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON
@@ -389,17 +366,22 @@
 %dir %{_libdir}/syslog-ng
 %attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-notls.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-tls.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libafuser.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libbasicfuncs.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libconfgen.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libconvertfuncs.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libcsvparser.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libdummy.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libpacctformat.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libsyslog-ng-crypto.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libsyslogformat.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
 %attr(755,root,root) %{_sbindir}/syslog-ng-ctl
+%attr(755,root,root) %{_bindir}/pdbtool
 %attr(755,root,root) %{_bindir}/update-patterndb
 
 %dir %{_datadir}/syslog-ng/include
@@ -418,6 +400,7 @@
 
 %dir %{_var}/lib/%{name}
 %dir %{_var}/lib/%{name}/xsd
+%{_mandir}/man1/pdbtool.1*
 %{_mandir}/man1/syslog-ng-ctl.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
@@ -446,22 +429,10 @@
 %doc modules/afmongodb/TODO
 %attr(755,root,root) %{_libdir}/syslog-ng/libafmongodb.so
 
-%files module-afsocket
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-notls.so
-%attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-tls.so
-
 %files module-afsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/syslog-ng/libafsql.so
 
-%files module-dbparser
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so
-%attr(755,root,root) %{_bindir}/pdbtool
-%{_mandir}/man1/pdbtool.1*
-
 %files module-tfjson
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/syslog-ng/libtfjson.so
@@ -484,6 +455,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.227  2011/11/11 20:42:00  qboosh
+- eeh, afsocket is required even for unix() sources, so merged back into base
+- dbparser likewise, required by SCL
+
 Revision 1.226  2011/11/11 17:32:43  qboosh
 - separated modules pulling additional libs: afmongodb, afsocket, afsql, dbparser, tfjson
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.226&r2=1.227&f=u