perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"

[packages/demarc.git] / demarc.spec

diff --git a/demarc.spec b/demarc.spec
index 5d6e0dd2149ee418a7d20bbc084afd7eabb7f522..3a1406ccd2e4833193843df2e6205dc1466c772d 100644 (file)
--- a/demarc.spec
+++ b/demarc.spec
@@ -5,18 +5,19 @@ Summary:      Network monitoring program
 Summary(pl):   Program do monitorowania sieci
 Name:          demarc
 Version:       %{ver}.%{subver}
-Release:       1
-License:       http://www.demarc.org/license/
+Release:       3
+License:       http://www.demarc.org/license/ (Free for non-commercial use)
 Group:         Networking
 Group(de):     Netzwerkwesen
 Group(es):     Red
 Group(pl):     Sieciowe
 Group(pt_BR):  Rede
-Source0:       http://www.demarc.org/downloads/demarc-105/demarc-%{ver}-%{subver}.tar.gz
+Source0:       http://www.demarc.org/downloads/demarc-105/%{name}-%{ver}-%{subver}.tar.gz
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.cron
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-whois-fix.patch
 URL:           http://www.demarc.org/
 BuildRequires: rpm-perlprov >= 4.0
 BuildRequires: perl >= 5.6
@@ -28,7 +29,7 @@ BuildRequires:        perl-Digest-MD5
 Requires:      apache
 Requires:      /etc/cron.d
 Prereq:                rc-scripts
-Requires:      rc-scripts
+Prereq:                /sbin/chkconfig
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,7 +52,7 @@ all from one centralized location.
 DEMARC to kompletny system monitorowania sieci pozwalaj±cy monitorowaæ
 ca³± sieæ serwerów z jednego interfejsu www.
 
-Zamiast posiadaæ jeden program sprawdzaj±cy integralno¶c plików, inny
+Zamiast posiadaæ jeden program sprawdzaj±cy integralno¶æ plików, inny
 program monitoruj±cy po³±czenia i stan Twojej sieci, i jeszcze jeden
 program monitoruj±cy sieæ w celach detekcji intruzów wystarczy DEMARC
 ³±cz±cy w sobie te trzy us³ugi w jednym programie klient/serwer. Nie
@@ -59,43 +60,48 @@ tylko mo
 mo¿esz reagowaæ na zmiany z jednej centralnej lokalizacji.
 
 %package client
-Summary:        Network monitoring program - client
-Summary(pl):    Program do monitorowania sieci - klient
-Requires:      snort >= 1.8.1
-Group:          Networking
+Summary:       Network monitoring program - client
+Summary(pl):   Program do monitorowania sieci - klient
+Requires:      snort(mysql) >= 1.8.1
+Group:         Networking
+Group(de):     Netzwerkwesen
+Group(es):     Red
+Group(pl):     Sieciowe
+Group(pt_BR):  Rede
 
 %description client
 DEMARC is an all-inclusive network monitoring program that allows you
 to monitor an entire network of servers from one powerful web
 interface.
 
-This is client program which should be installed on all monitored servers.
+This is client program which should be installed on all monitored
+servers.
 
 %description -l pl client
 DEMARC to kompletny system monitorowania sieci pozwalaj±cy monitorowaæ
 ca³± sieæ serwerów z jednego interfejsu www.
 
-To jest program kliencki, który powinien byæ zainstalowany na wszystkich
-monitorowanych serwerach.
+To jest program kliencki, który powinien byæ zainstalowany na
+wszystkich monitorowanych serwerach.
 
 %prep
 %setup -q -n %{name}-%{ver}-%{subver}
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,demarcd,httpd}
 install -d $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_datadir}/demarc/{images,cgi}
-install -d $RPM_BUILD_ROOT/var/state/demarcd
+install -d $RPM_BUILD_ROOT/%{_var}/lib/demarcd
 
 install %{SOURCE1}             $RPM_BUILD_ROOT/etc/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/etc/demarcd
-cp -ar  cgi                    $RPM_BUILD_ROOT%{_datadir}/demarc
-cp -ar  images                 $RPM_BUILD_ROOT%{_datadir}/demarc
+cp -ar  cgi images             $RPM_BUILD_ROOT%{_datadir}/demarc
 install install/{c*,d*,p*}     $RPM_BUILD_ROOT%{_datadir}/demarc
 
 gzip -9nf install/{CHAN*,INS*,LIC*}
@@ -104,9 +110,7 @@ gzip -9nf install/{CHAN*,INS*,LIC*}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-echo 'Remember to add "Include demarc.conf" to httpd.conf and note that'
-echo 'in most cases there is no need to start "snort" as separate'
-echo 'daemon, so turn it off using "/sbin/chkconfig snort off".'
+echo 'Remember to add "Include demarc.conf" to httpd.conf.'
 
 %post client
 if [ "$1" = "1" ] ; then
@@ -118,6 +122,8 @@ if [ -f /var/lock/subsys/demarcd ]; then
 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
 
 
@@ -158,4 +164,4 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/demarcd/*.conf
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/demarcd/*.cmds
 %attr(640,root,root) %config /etc/cron.d/%{name}
-%attr(750,root,root) /var/state/demarcd
+%attr(750,root,root) %{_var}/lib/demarcd