SPECS: psad.spec - use perl packages

[glen]

Author: glen                         Date: Mon Dec 18 00:38:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use perl packages

---- Files affected:
SPECS:
   psad.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/psad.spec
diff -u SPECS/psad.spec:1.8 SPECS/psad.spec:1.9
--- SPECS/psad.spec:1.8	Mon Dec 18 01:07:38 2006
+++ SPECS/psad.spec	Mon Dec 18 01:38:48 2006
@@ -1,12 +1,11 @@
 # $Revision$, $Date$
 # TODO
-# - use system perl (make packages)
 # - use system snort rules?
 %include	/usr/lib/rpm/macros.perl
 Summary:	Psad analyzes iptables log messages for suspect traffic
 Name:		psad
 Version:	2.0.1
-Release:	0.5
+Release:	0.6
 License:	GPL
 Group:		Daemons
 URL:		http://www.cipherdyne.org/psad/
@@ -22,6 +21,8 @@
 %if %{with autodeps}
 BuildRequires:	perl-Bit-Vector
 BuildRequires:	perl-Date-Calc
+BuildRequires:	perl-IPTables-ChainMgr
+BuildRequires:	perl-IPTables-Parse
 BuildRequires:	perl-Net-IPv4Addr
 BuildRequires:	perl-Unix-Syslog
 %endif
@@ -43,16 +44,15 @@
 rm -rf Date-Calc
 rm -rf Net-IPv4Addr
 rm -rf Unix-Syslog
+rm -rf IPTables-Parse
+rm -rf IPTables-ChainMgr
 rm -rf whois
 
 %build
-DIRS="Psad IPTables-Parse IPTables-ChainMgr"
-for i in $DIRS; do
-	cd $i
-	%{__perl} Makefile.PL \
-		INSTALLDIRS=vendor
-	cd ..
-done
+cd Psad
+%{__perl} Makefile.PL \
+	INSTALLDIRS=vendor
+cd ..
 
 ### build psad binaries (kmsgsd and psadwatchd)
 %{__make} \
@@ -61,10 +61,6 @@
 ### build perl modules used by psad
 %{__make} -C Psad \
 	OPTIMIZE="%{rpmcflags}"
-%{__make} -C IPTables-Parse \
-	OPTIMIZE="%{rpmcflags}"
-%{__make} -C IPTables-ChainMgr \
-	OPTIMIZE="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,16 +72,6 @@
 	DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Psad/.packlist
 
-%{__make} -C IPTables-Parse \
-	pure_install \
-	DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/IPTables/Parse/.packlist
-
-%{__make} -C IPTables-ChainMgr \
-	pure_install \
-	DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/IPTables/ChainMgr/.packlist
-
 install {psad,kmsgsd,psadwatchd} $RPM_BUILD_ROOT%{_sbindir}
 install fwcheck_psad.pl $RPM_BUILD_ROOT%{_sbindir}/fwcheck_psad
 install nf2csv $RPM_BUILD_ROOT%{_bindir}/nf2csv
@@ -176,11 +162,7 @@
 %dir /var/run/psad
 
 # perl files
-%{_mandir}/man3/IPTables::ChainMgr.3pm*
-%{_mandir}/man3/IPTables::Parse.3pm*
 %{_mandir}/man3/Psad.3pm*
-%{perl_vendorlib}/IPTables/ChainMgr.pm
-%{perl_vendorlib}/IPTables/Parse.pm
 %{perl_vendorlib}/Psad.pm
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -189,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/12/18 00:38:48  glen
+- use perl packages
+
 Revision 1.8  2006/12/18 00:07:38  glen
 - use system whois
 - cc, cflags
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/psad.spec?r1=1.8&r2=1.9&f=u