- remove unused vars (never used by this initscript)

[packages/syslog-ng.git] / syslog-ng.spec

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1931f85f22fce94008e1e2e768a94bfa4dc1f2b5..a6c181a95fa03be088a10177142778fb0c301d2b 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,4 +1,8 @@
 #
+# TODO:
+#      - move SQL module to a separate package
+#      - relies on libs in /usr/ which is wrong
+#
 # Conditional build:
 %bcond_with    dynamic         # link dynamically with glib, eventlog, pcre, openssl
 %if "%{pld_release}" == "ac"
@@ -17,22 +21,21 @@ Summary:    Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):     Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
-Version:       3.2.2
-Release:       0.1
+Version:       3.2.4
+Release:       2
 License:       GPL v2
 Group:         Daemons
 Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: ed8ebe559d52a63fb61e3e2db566643f
+# Source0-md5: 5995f7dad0053a478b60a63f6f754203
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
-Source4:       http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
-# Source4-md5: 882f77ad2673e6490099b5393fe26796
+Source4:       http://www.balabit.com/support/documentation/syslog-ng-ose-v3.2-guide-admin-en_0.pdf
+# Source4-md5: 4fa86dc863ed0206c004b3be7292bcbf
 Source5:       %{name}-simple.conf
 Source6:       %{name}.upstart
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-datadir.patch
-Patch2:                %{name}-pyssl.patch
+Patch0:                %{name}-datadir.patch
+Patch1:                cap_syslog.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -49,7 +52,7 @@ BuildRequires:        python-modules
 BuildRequires: tzdata
 %endif
 %if %{with dynamic}
-BuildRequires: eventlog-devel >= 0.2
+BuildRequires: eventlog-devel >= 0.2.12
 BuildRequires: glib2-devel >= 1:%{glib2_ver}
 BuildRequires: libcap-devel
 %{?with_sql:BuildRequires:     libdbi-devel >= 0.8.3-2}
@@ -58,7 +61,7 @@ BuildRequires:        libwrap-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 %else
-BuildRequires: eventlog-static >= 0.2
+BuildRequires: eventlog-static >= 0.2.12
 BuildRequires: glib2-static >= 1:%{glib2_ver}
 BuildRequires: glibc-static
 BuildRequires: libcap-static
@@ -68,6 +71,7 @@ BuildRequires:        libwrap-static
 BuildRequires: openssl-static
 BuildRequires: pcre-static
 BuildRequires: zlib-static
+Requires:      libnet >= 1:1.1.2.1-7
 %endif
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
@@ -80,8 +84,15 @@ Conflicts:   msyslog
 Conflicts:     syslog
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# syslog-ng has really crazy linking rules (see their bugzilla).
+# Some rules, according to syslog-ng devs, are like this:
+# - libsyslog-ng.so has undefined symbols for third party libraries
+#   and these symbols should go via main syslog-ng binary
+# - same applies for modules
 %if %{without dynamic}
 %define                no_install_post_check_so        1
+# filterout_ld - see comment few lines above
+%define                filterout_ld                    -Wl,--as-needed -Wl,--no-copy-dt-needed-entries
 %define                _sbindir                        /sbin
 %define                _libdir                         /%{_lib}
 %endif
@@ -114,6 +125,9 @@ Summary(pl.UTF-8):  Opis zadania Upstart dla syslog-ng
 Group:         Daemons
 Requires:      %{name} = %{version}-%{release}
 Requires:      upstart >= 0.6
+Conflicts:     avahi-upstart < 0.6.30-2
+Conflicts:     openssh-server-upstart < 2:5.8p2-2
+Conflicts:     postgresql-upstart < 9.0.4-2
 
 %description upstart
 Upstart job description for syslog-ng.
@@ -125,10 +139,11 @@ Opis zadania Upstart dla syslog-ng.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
+%{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
+
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -158,13 +173,13 @@ cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %{__make}
 
-%{?with_tests:%{__make} check}
+%{?with_tests:LD_LIBRARY_PATH=$PWD/lib/.libs %{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{init,sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
-       $RPM_BUILD_ROOT/var/{log,lib/%{name}}
+       $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -242,7 +257,7 @@ exit 0
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/relogger.pl
 %doc doc/examples/syslog-ng.conf.sample contrib/syslog-ng.conf.{doc,simple,RedHat}
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-v3.0-guide-admin-en.pdf
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v3.2-guide-admin-en_0.pdf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
@@ -253,8 +268,6 @@ exit 0
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
 %attr(755,root,root) %{_libdir}/libsyslog-ng.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsyslog-ng.so.0
-%attr(755,root,root) %{_libdir}/libsyslog-ng-patterndb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsyslog-ng-patterndb.so.0
 %dir %{_libdir}/syslog-ng
 %attr(755,root,root) %{_libdir}/syslog-ng/lib*.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
@@ -278,6 +291,7 @@ exit 0
 %{_datadir}/syslog-ng/xsd/patterndb-*.xsd
 
 %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*