Merge remote-tracking branch 'stevee/pcre'

[people/ms/ipfire-3.x.git] / ulogd2 / ulogd2.nm

diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index f583b3fd729ddc46715f74cf8bf20215b7777a70..621327f545a15674d8b3d35034f1d8008ba860f5 100644 (file)
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -4,8 +4,9 @@
 ###############################################################################
 
 name       = ulogd2
-version    = 2.0.0beta3
-release    = 3
+version    = 2.0.2
+release    = 1
+epoch      = 1
 thisapp    = ulogd-%{version}
 
 groups     = Networking/Statistics
@@ -21,20 +22,25 @@ description
        ethernet devices directly.
 end
 
-source_dl += http://ftp.netfilter.org/pub/ulogd/
+source_dl  = http://ftp.netfilter.org/pub/ulogd/
 sources    = %{thisapp}.tar.bz2
 
 build
        requires
-               libnfnetlink-devel
-               libnetfilter_conntrack-devel
+               libmnl-devel
+               libnfnetlink-devel >= 1.0.1
+               libnetfilter_acct-devel >= 1.0.1
+               libnetfilter_conntrack-devel >= 1.0.2
                libnetfilter_log-devel
                libpcap-devel
                sqlite-devel
        end
 
+       # Set libdir to "/usr/lib" for every architecture to install the ulogd2 plugins
+       # to this folder.
        configure_options+= \
-               --sysconfdir=/etc
+               --sysconfdir=/etc \
+               --libdir=%{prefix}/lib
 
        install_cmds
                mkdir -pv %{BUILDROOT}/etc
@@ -47,6 +53,35 @@ end
 
 packages
        package %{name}
+               requires
+                       libnfnetlink >= 1.0.1
+                       libnetfilter_acct >= 1.0.1
+                       libnetfilter_conntrack >= 1.0.2
+               end
+
+               configfiles
+                       /etc/ulogd.conf
+               end
+
+               script postin
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl enable ulogd.service >/dev/null 2>&1 || :
+               end
+               
+               script preun
+                       systemctl --no-reload disable ulogd.service >/dev/null 2>&1 || :
+                       systemctl stop ulogd.service >/dev/null 2>&1 || :
+               end
+               
+               script postun
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl try-restart ulogd.service >/dev/null 2>&1 || :
+               end
+       end
 
        package %{name}-debuginfo
                template DEBUGINFO