|
|
Author: mmaslano
Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12965
Modified Files:
iptraf.spec
Added Files:
iptraf iptraf-3.0.0-incltypes.patch
Log Message:
Add patch, clean spec.
--- NEW FILE iptraf ---
# Logrotate file for iptraf
/var/log/iptraf/* {
compress
delaycompress
missingok
notifempty
rotate 4
create 0600 root root
}
iptraf-3.0.0-incltypes.patch:
ifaces.c | 1 +
ifstats.c | 1 +
serv.c | 1 +
3 files changed, 3 insertions(+)
--- NEW FILE iptraf-3.0.0-incltypes.patch ---
--- iptraf-3.0.0/src/ifstats.c.old 2007-04-03 15:12:40.000000000 +0200
+++ iptraf-3.0.0/src/ifstats.c 2007-04-03 15:13:00.000000000 +0200
@@ -26,6 +26,7 @@
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <linux/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
--- iptraf-3.0.0/src/serv.c.old 2007-04-04 13:59:33.000000000 +0200
+++ iptraf-3.0.0/src/serv.c 2007-04-04 14:17:33.000000000 +0200
@@ -32,6 +32,7 @@
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/udp.h>
+#include <linux/types.h>
#include <linux/if_packet.h>
#include <linux/if_ether.h>
#include <listbox.h>
--- iptraf-3.0.0/src/ifaces.c.old 2007-04-04 14:23:05.000000000 +0200
+++ iptraf-3.0.0/src/ifaces.c 2007-04-04 14:25:32.000000000 +0200
@@ -27,6 +27,7 @@
#include <net/if.h>
#include <fcntl.h>
#include <string.h>
+#include <linux/types.h>
#include <linux/if_packet.h>
#include "links.h"
#include "error.h"
Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- iptraf.spec 11 Dec 2006 10:30:21 -0000 1.24
+++ iptraf.spec 4 Apr 2007 14:21:20 -0000 1.25
@@ -1,8 +1,9 @@
-Summary: A console-based network monitoring utility.
+Summary: A console-based network monitoring utility
Name: iptraf
Version: 3.0.0
-Release: 5%{?dist}
-Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
+Release: 6%{?dist}
+Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
+Source1: iptraf
URL: http://iptraf.seul.org/
Patch0: iptraf-2.4.0-Makefile.patch
Patch1: iptraf-2.7.0-install.patch
@@ -13,9 +14,11 @@
Patch6: iptraf-3.0.0-longdev.patch
Patch7: iptraf-3.0.0-compile.fix.patch
Patch8: iptraf-3.0.0-in_trafic.patch
+Patch9: iptraf-3.0.0-incltypes.patch
+
License: GPL
Group: Applications/System
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
%description
@@ -47,6 +50,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
make -C src CFLAGS="$RPM_OPT_FLAGS" \
@@ -69,23 +73,30 @@
# remove everything besides the html and pictures in Documentation
find Documentation -type f | grep -v '\.html$\|\.png$\|/stylesheet' | \
- xargs rm -f
+ xargs rm -f
rm -rf Documentation/.xvpics
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
+cp %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/iptraf
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc CHANGES FAQ LICENSE INSTALL README* RELEASE-NOTES
%doc Documentation
%attr(755,root,root) %{_prefix}/bin/*
%{_mandir}/*/*
-%dir %attr(700,root,root) /var/lock/iptraf
-%dir %attr(700,root,root) /var/log/iptraf
-%dir %attr(700,root,root) /var/lib/iptraf
+%dir %attr(755,root,root) /var/lock/iptraf
+%dir %attr(755,root,root) /var/log/iptraf
+%dir %attr(755,root,root) /var/lib/iptraf
+%dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
%changelog
+* Wed Apr 4 2007 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 3.0.0-6
+- merge review, add logrotate file
+- rhbz#225907
+
* Mon Dec 11 2006 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 3.0.0-5
- input traffic
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|