SPECS: psad.spec - fix FIXME :) - don't use chmod for atributes (i...

shadzik shadzik at pld-linux.org
Sun Dec 17 20:38:14 CET 2006


Author: shadzik                      Date: Sun Dec 17 19:38:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix FIXME :)
- don't use chmod for atributes (it's done in %files section)

---- Files affected:
SPECS:
   psad.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/psad.spec
diff -u SPECS/psad.spec:1.3 SPECS/psad.spec:1.4
--- SPECS/psad.spec:1.3	Sun Dec 17 20:20:25 2006
+++ SPECS/psad.spec	Sun Dec 17 20:38:09 2006
@@ -50,14 +50,12 @@
 	mv $i.tmp $i
 done
 
-# FIXME - do it with a loop
-perl Psad/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl IPTables-Parse/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl IPTables-ChainMgr/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl Bit-Vector/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl Net-IPv4Addr/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl Unix-Syslog/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
-perl Date-Calc/Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
+DIRS="Psad IPTables-Parse IPTables-ChainMgr Bit-Vector Net-IPv4Addr Unix-Syslog Date-Calc"
+for i in $DIRS; do
+	cd $i
+	perl Makefile.PL PREFIX=%{psadlibdir} LIB=%{psadlibdir}
+	cd ..
+done
 
 %build
 ### build psad binaries (kmsgsd and psadwatchd)
@@ -175,9 +173,6 @@
 
 /bin/touch %{psadlogdir}/fwdata
 chown root.root %{psadlogdir}/fwdata
-chmod 0500 %{_sbindir}/psad
-chmod 0500 %{_sbindir}/kmsgsd
-chmod 0500 %{_sbindir}/psadwatchd
 chmod 0600 %{psadlogdir}/fwdata
 if [ ! -p %psadvarlibdir/psadfifo ];
 then [ -e %psadvarlibdir/psadfifo ] && /bin/rm -f %psadvarlibdir/psadfifo
@@ -219,8 +214,8 @@
 %files
 %defattr(644,root,root,755)
 %dir %{psadlogdir}
-%dir %psadvarlibdir
-%dir %psadrundir
+%dir %{psadvarlibdir}
+%dir %{psadrundir}
 %attr(754,root,root) /etc/rc.d/init.d/psad
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
@@ -248,6 +243,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/12/17 19:38:09  shadzik
+- fix FIXME :)
+- don't use chmod for atributes (it's done in %files section)
+
 Revision 1.3  2006/12/17 19:20:25  shadzik
 - more macros unification
 
================================================================

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



More information about the pld-cvs-commit mailing list