Author: qboosh Date: Fri Nov 11 17:32:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- separated modules pulling additional libs: afmongodb, afsocket, afsql,
dbparser, tfjson
---- Files affected:
packages/syslog-ng:
syslog-ng.spec (1.225 -> 1.226)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.225
packages/syslog-ng/syslog-ng.spec:1.226
--- packages/syslog-ng/syslog-ng.spec:1.225 Fri Nov 11 10:45:00 2011
+++ packages/syslog-ng/syslog-ng.spec Fri Nov 11 18:32:43 2011
@@ -1,7 +1,6 @@
# $Revision$, $Date$
#
# TODO:
-# - move SQL module to a separate package
# - relies on libs in /usr which is wrong
# (well, for modules bringing additional functionality it's acceptable IMO
--q)
# - use external libivykis [>= 0.18+syslog-ng updates]
@@ -16,9 +15,9 @@
%bcond_without tests
%if "%{pld_release}" == "ac"
-%define glib2_ver 2.16.0
+%define glib2_ver 1:2.16.0
%else
-%define glib2_ver 2.24.0
+%define glib2_ver 1:2.24.0
%endif
Summary: Syslog-ng - new generation of the system logger
Summary(pl.UTF-8): Syslog-ng - systemowy demon logujący nowej generacji
@@ -26,7 +25,7 @@
Name: syslog-ng
Version: 3.3.1
Release: 3
-License: GPL v2
+License: GPL v2+ with OpenSSL exception
Group: Daemons
Source0:
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
# Source0-md5: a3dfe8a49aa8ce1aeb7e1ed5b11af378
@@ -46,7 +45,7 @@
BuildRequires: bison >= 2.4
BuildRequires: eventlog-devel >= 0.2.12
BuildRequires: flex
-BuildRequires: glib2-devel >= 1:%{glib2_ver}
+BuildRequires: glib2-devel >= %{glib2_ver}
BuildRequires: json-c-devel >= 0.7
BuildRequires: libcap-devel
%{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2}
@@ -68,7 +67,7 @@
%endif
%if %{without dynamic}
BuildRequires: eventlog-static >= 0.2.12
-BuildRequires: glib2-static >= 1:%{glib2_ver}
+BuildRequires: glib2-static >= %{glib2_ver}
BuildRequires: pcre-static >= 6.1
BuildRequires: zlib-static
%endif
@@ -76,16 +75,10 @@
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: eventlog >= 0.2.12
-Requires: glib2 >= 1:%{glib2_ver}
+Requires: glib2 >= %{glib2_ver}
Requires: pcre >= 6.1
Requires: psmisc >= 20.1
Requires: rc-scripts >= 0.4.3.0
-# for modules
-Requires: json-c >= 0.7
-Requires: libdbi >= 0.8.3-2
-Requires: libmongo-client >= 0.1.0
-Requires: libnet >= 1:1.1.2.1-7
-Requires: openssl >= 0.9.8
Provides: syslogdaemon
Conflicts: klogd
Conflicts: msyslog
@@ -143,13 +136,83 @@
%description upstart -l pl.UTF-8
Opis zadania Upstart dla demona syslog-ng.
+%package module-afmongodb
+Summary: MongoDB destination support module for syslog-ng
+Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libmongo-client >= 0.1.0
+
+%description module-afmongodb
+MongoDB destination support module for syslog-ng.
+
+%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
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libdbi >= 0.8.3-2
+Requires: openssl >= 0.9.8
+
+%description module-afsql
+SQL destination support module for syslog-ng (via libdbi).
+
+%description module-afsql -l pl.UTF-8
+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
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: json-c >= 0.7
+
+%description module-tfjson
+JSON formatting template function for syslog-ng.
+
+%description module-tfjson -l pl.UTF-8
+Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON.
+
%package libs
Summary: Shared library for syslog-ng
Summary(pl.UTF-8): Biblioteka współdzielona sysloga-ng
Group: Libraries
%if %{with dynamic}
Requires: eventlog >= 0.2.12
-Requires: glib2 >= 1:%{glib2_ver}
+Requires: glib2 >= %{glib2_ver}
Requires: pcre >= 6.1
%endif
Conflicts: syslog-ng < 3.3.1-3
@@ -167,7 +230,7 @@
Requires: %{name}-libs = %{version}-%{release}
%if %{with dynamic}
Requires: eventlog-devel >= 0.2.12
-Requires: glib2-devel >= 1:%{glib2_ver}
+Requires: glib2-devel >= %{glib2_ver}
Requires: pcre-devel >= 6.1
%endif
@@ -324,10 +387,19 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/syslog-ng
%attr(754,root,root) /etc/rc.d/init.d/syslog-ng
%dir %{_libdir}/syslog-ng
-%attr(755,root,root) %{_libdir}/syslog-ng/lib*.so
+%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/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/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
@@ -346,7 +418,6 @@
%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*
@@ -370,6 +441,31 @@
%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
%endif
+%files module-afmongodb
+%defattr(644,root,root,755)
+%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
+
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsyslog-ng-%{version}.so
@@ -388,6 +484,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226 2011/11/11 17:32:43 qboosh
+- separated modules pulling additional libs: afmongodb, afsocket, afsql,
dbparser, tfjson
+
Revision 1.225 2011/11/11 09:45:00 qboosh
- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)
- added missing release 3 note to previous changelog entry
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.225&r2=1.226&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
