- remove extra unneeded slash

[packages/ulogd.git] / ulogd.spec

diff --git a/ulogd.spec b/ulogd.spec
index e218f44781ca516c42fca15fa995ddf496949d8a..089865ea257759495a8ed15d5c28130391bd8d0c 100644 (file)
--- a/ulogd.spec
+++ b/ulogd.spec
@@ -1,27 +1,31 @@
+# TODO: (maybe ;)
+# - pgsql support
+# - sqlite support
 Summary:       ULOGD - the Userspace Logging Daemon for iptables
 Summary(pl):   Demon loguj±cy w trybie u¿ytkownika dla iptables
 Name:          ulogd
-Version:       1.00
-Release:       1
+Version:       1.23
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2
-# Source0-md5: debd61d22f28ca9f4505bb488a1a1e1c
+# Source0-md5: fa3dfcaacf31855626d5b731b04a077f
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
-Source4:       %{name}.conf
-URL:           http://www.gnumonks.org/projects/ulogd
+Patch0:                %{name}-includes.patch
+URL:           http://gnumonks.org/projects/ulogd/
 BuildRequires: autoconf
 BuildRequires: mysql-devel
-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)
 
-%define                _sysconfdir     /etc
-
 %description
 This packages is intended for passing packets from the kernel to
 userspace to do some logging there. It should work like that:
@@ -42,7 +46,6 @@ u
 Summary:       MySQL plugin for ulogd
 Summary(pl):   Wtyczka MySQL dla ulogd
 Group:         Networking/Daemons
-Requires:      mysql
 Obsoletes:     iptables-ulogd-mysql
 
 %description mysql
@@ -53,8 +56,14 @@ Wtyczka MySQL dla ulogd.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%if "%{_lib}" != "lib"
+sed -e 's@lib/@%{_lib}/@g' -i configure.in
+sed -e 's@${MYSQLLIBS}@%{_libdir}@g' -i configure.in
+%endif
+
 %{__autoconf}
 %configure \
        --with-mysql
@@ -62,16 +71,16 @@ Wtyczka MySQL dla ulogd.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{sysconfig,logrotate.d,rc.d/init.d}} \
+install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{sysconfig,logrotate.d,rc.d/init.d,ulogd}} \
        $RPM_BUILD_ROOT/var/log
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ulogd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ulogd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/ulogd
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
-
+install -D %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 
 touch $RPM_BUILD_ROOT/var/log/ulogd{,.pktlog}
 
@@ -85,32 +94,29 @@ 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
 
 %files
 %defattr(644,root,root,755)
 %doc Changes doc/*.{ps,txt,html}
-%attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/ulogd
-%attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/ulogd.conf
-%attr(640,root,root) /etc/logrotate.d/ulogd
+%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
+%attr(750,root,root) %dir %{_sysconfdir}/ulogd
 %attr(754,root,root) /etc/rc.d/init.d/ulogd
 
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/ulogd/ulogd_[BLOP]*.so
+%dir %{_libdir}/ulogd
+%attr(755,root,root) %{_libdir}/ulogd/ulogd_[BLOPS]*.so
 
 %attr(640,root,root) %ghost /var/log/*
+%{_mandir}/man?/%{name}.*
 
 %files mysql
 %defattr(644,root,root,755)