Author: glen Date: Sun Mar 12 22:44:24 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add TCP.flags to %doc
- produce address to ignore on first install instead of calling hostname each
time
- add DESTDIR patch
- removed unneccessary {Kill,Launch}Loggers
- rel 8
---- Files affected:
SPECS:
protolog.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: SPECS/protolog.spec
diff -u SPECS/protolog.spec:1.39 SPECS/protolog.spec:1.40
--- SPECS/protolog.spec:1.39 Sun Mar 12 23:08:47 2006
+++ SPECS/protolog.spec Sun Mar 12 23:44:18 2006
@@ -3,18 +3,20 @@
Summary(pl): Program zapisujący informacje związane z protokołami
Internetowymi
Name: protolog
Version: 1.0.8
-Release: 7
+Release: 8
License: GPL
Group: Networking
URL: http://www.grigna.com/diego/linux/
Source0:
ftp://sunsite.unc.edu/pub/Linux/system/network/monitor/%{name}-%{version}.tar.gz
# Source0-md5: c5a48e61170b3ead0dc55ad86454da1d
Source1: %{name}.logrotate
-Source2: %{name}.conf
+Source2: %{name}.sysconfig
Source3: %{name}.init
Patch0: %{name}-1.0.8.make.diff
+Patch1: %{name}-DESTDIR.patch
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+Requires(post): sed >= 4.0
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,7 +30,8 @@
%prep
%setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
%build
%{__make} -C src \
@@ -42,9 +45,10 @@
$RPM_BUILD_ROOT/var/log/archiv/protolog
%{__make} -C src install \
- bindir=$RPM_BUILD_ROOT%{_sbindir} \
- mandir=$RPM_BUILD_ROOT%{_mandir}/man8 \
- logdir=$RPM_BUILD_ROOT/var/log/protolog
+ DESTDIR=$RPM_BUILD_ROOT \
+ bindir=%{_sbindir} \
+ mandir=%{_mandir}/man8 \
+ logdir=/var/log/protolog
touch
$RPM_BUILD_ROOT/var/log/protolog/{icmp.log,icmp.raw,tcp.log,tcp.raw,udp.log,udp.raw}
@@ -52,10 +56,17 @@
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/protolog
+# handled by initscript
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{KillLoggers,LaunchLoggers}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
+if [ "$1" = 1 ]; then
+ localip=$(/sbin/ip -f inet addr show | awk '/inet/{print $2}' | awk -F/
'{print $1}' | LC_ALL=C sort -u | xargs)
+ sed -i -e "/^#IGNORE_ADDR=.*/s,.*,IGNORE_ADDR='$localip',"
/etc/sysconfig/protolog
+fi
/sbin/chkconfig --add protolog
%service protolog restart
@@ -67,7 +78,7 @@
%files
%defattr(644,root,root,755)
-%doc doc/BUGS doc/README
+%doc doc/{BUGS,README,TCP.flags.txt}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/protolog
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/protolog
%attr(755,root,root) %{_sbindir}/*
@@ -83,6 +94,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2006/03/12 22:44:18 glen
+- add TCP.flags to %doc
+- produce address to ignore on first install instead of calling hostname each
time
+- add DESTDIR patch
+- removed unneccessary {Kill,Launch}Loggers
+- rel 8
+
Revision 1.39 2006/03/12 22:08:47 glen
- log files as %ghost, not %config
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/protolog.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
