- drop obsolete and outdated manual inclusion of rpm macros

[packages/demarc.git] / demarc.spec

diff --git a/demarc.spec b/demarc.spec
index bd2a5df481d4b3e242f042b67ca3348a69be3bfc..d285e52e807992ce49b545386e78669d163180c0 100644 (file)
--- a/demarc.spec
+++ b/demarc.spec
@@ -1,8 +1,9 @@
-%include       /usr/lib/rpm/macros.perl
+# TODO
+# - integrate pld webapps framework
 %define ver    1.05
 %define subver RC1
 Summary:       Network monitoring program
-Summary(pl.UTF-8):   Program do monitorowania sieci
+Summary(pl.UTF-8):     Program do monitorowania sieci
 Name:          demarc
 Version:       %{ver}.%{subver}
 Release:       4
@@ -23,8 +24,9 @@ BuildRequires:        perl-Digest-MD5
 BuildRequires: perl-Msql-Mysql-modules
 BuildRequires: perl-devel >= 1:5.6
 BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
-Requires:      /etc/cron.d
+Requires:      crondaemon
 Requires:      rc-scripts
 Requires:      webserver = apache
 BuildArch:     noarch
@@ -58,7 +60,7 @@ możesz reagować na zmiany z jednej centralnej lokalizacji.
 
 %package client
 Summary:       Network monitoring program - client
-Summary(pl.UTF-8):   Program do monitorowania sieci - klient
+Summary(pl.UTF-8):     Program do monitorowania sieci - klient
 Group:         Networking
 Requires:      snort(mysql) >= 1.8.1
 
@@ -88,13 +90,13 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,demarcd,httpd} \
        $RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/demarc/{images,cgi}} \
        $RPM_BUILD_ROOT%{_var}/lib/demarcd
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
-install %{SOURCE2}             $RPM_BUILD_ROOT/etc/rc.d/init.d/demarcd
-install %{SOURCE3}             $RPM_BUILD_ROOT/etc/cron.d/%{name}
-install bin/demarcd            $RPM_BUILD_ROOT%{_sbindir}
-install conf/* $RPM_BUILD_ROOT%{_sysconfdir}/demarcd
-cp -a  cgi images              $RPM_BUILD_ROOT%{_datadir}/demarc
-install install/{c*,d*,p*}     $RPM_BUILD_ROOT%{_datadir}/demarc
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/demarcd
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+install -p bin/demarcd $RPM_BUILD_ROOT%{_sbindir}
+cp -p conf/* $RPM_BUILD_ROOT%{_sysconfdir}/demarcd
+cp -a cgi images $RPM_BUILD_ROOT%{_datadir}/demarc
+cp -p install/{c*,d*,p*} $RPM_BUILD_ROOT%{_datadir}/demarc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,21 +109,19 @@ if [ "$1" = "1" ] ; then
        touch /var/log/demarcd && chmod 750 /var/log/demarcd
 fi
 /sbin/chkconfig --add demarcd
-if [ -f /var/lock/subsys/demarcd ]; then
-       /etc/rc.d/init.d/demarcd restart 1>&2
-else
-       echo "Run \"%{_sbindir}/demarcd -I\" to install new snort sensor and then"
-       echo "run \"/etc/rc.d/init.d/demarcd start\" to start demarcd daemon."
-       echo "Note that in most cases there is no need to start \"snort\" as"
-       echo "separate daemon, so turn it off using \"/sbin/chkconfig snort off\"."
-fi
+%service demarcd restart
+%banner -e -o %{name} <<EOF
+
+Run "%{_sbindir}/demarcd -I" to install new snort sensor and then
+run "service demarcd start" to start demarcd daemon.
 
+Note that in most cases there is no need to start "snort" as
+separate daemon, so turn it off using "chkconfig snort off".
+EOF
 
 %preun client
 if [ "$1" = "0" ] ; then
-       if [ -f /var/lock/subsys/demarcd ]; then
-               /etc/rc.d/init.d/demarcd stop 1>&2
-       fi
+       %service demarcd stop
        /sbin/chkconfig --del demarcd
 fi
 
@@ -153,5 +153,5 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}/demarcd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/demarcd/*.conf
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/demarcd/*.cmds
-%attr(640,root,root) %config /etc/cron.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %attr(750,root,root) %{_var}/lib/demarcd