- rel 3 (libmysqlclient_15)

[packages/ulogd.git] / ulogd.spec

diff --git a/ulogd.spec b/ulogd.spec
index dc1dde7809612d7897277fb73a6f2b7616cee310..335cd7fd89676a9778d3af969295d21a4768763b 100644 (file)
--- a/ulogd.spec
+++ b/ulogd.spec
@@ -4,12 +4,12 @@
 Summary:       ULOGD - the Userspace Logging Daemon for iptables
 Summary(pl):   Demon loguj±cy w trybie u¿ytkownika dla iptables
 Name:          ulogd
-Version:       1.22
-Release:       1.1
+Version:       1.23
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2
-# Source0-md5: 2593dfc51c0bc1d8f86519fb13dd5f34
+# Source0-md5: fa3dfcaacf31855626d5b731b04a077f
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -17,11 +17,13 @@ Patch0:             %{name}-includes.patch
 URL:           http://gnumonks.org/projects/ulogd/
 BuildRequires: autoconf
 BuildRequires: mysql-devel
-PreReq:                rc-scripts
-Requires(post,preun):  /sbin/chkconfig
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
 Requires(post):        fileutils
-#Requires:     kernel >= 2.4.0test9
+Requires(post,preun):  /sbin/chkconfig
 Requires:      iptables
+#Requires:     kernel >= 2.4.0test9
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,17 +94,11 @@ if [ ! -f /var/log/ulogd ]; then
 fi
 
 /sbin/chkconfig --add ulogd
-if [ -f /var/lock/subsys/ulogd ]; then
-       /etc/rc.d/init.d/ulogd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/ulogd start\" to start ulogd daemon." 1>&2
-fi
+%service ulogd restart "ulogd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/ulogd ]; then
-               /etc/rc.d/init.d/ulogd stop 1>&2
-       fi
+       %service ulogd stop
        /sbin/chkconfig --del ulogd
 fi
 
@@ -112,7 +108,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ulogd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ulogd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ulogd
-%dir(750,root,root) %{_sysconfdir}/ulogd
+%attr(750,root,root) %dir %{_sysconfdir}/ulogd
 %attr(754,root,root) /etc/rc.d/init.d/ulogd
 
 %attr(755,root,root) %{_sbindir}/*