rpms/arptables_jf/devel arptables_jf-0.0.8-header.patch, NONE, 1.1 arptables_jf.spec, 1.22, 1.23 sources, 1.6, 1.7

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/arptables_jf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16768

Modified Files:
	arptables_jf.spec sources 
Added Files:
	arptables_jf-0.0.8-header.patch 
Log Message:
* Fri Jan 22 2010 Jiri Skala <jskala at redhat.com> - 0.0.8-17
- moved header patch from sources to cvs
- fixes merge review findings #225255


arptables_jf-0.0.8-header.patch:
 arp_tables.h |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE arptables_jf-0.0.8-header.patch ---
--- arptables_jf-0.0.8/arp_tables.h.jk	2006-07-13 13:42:11.000000000 -0400
+++ arptables_jf-0.0.8/arp_tables.h	2006-07-13 13:42:25.000000000 -0400
@@ -16,7 +16,6 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #endif
-#include <linux/compiler.h>
 #include "netfilter_arp.h"
 
 #define ARPT_FUNCTION_MAXNAMELEN 30


Index: arptables_jf.spec
===================================================================
RCS file: /cvs/extras/rpms/arptables_jf/devel/arptables_jf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- arptables_jf.spec	24 Jul 2009 17:07:53 -0000	1.22
+++ arptables_jf.spec	22 Jan 2010 14:41:38 -0000	1.23
@@ -1,10 +1,9 @@
-Summary: Userspace control program for the arptables network filter.
+Summary: Userspace control program for the arptables network filter
 
 Name: arptables_jf
 
-Epoch: 0
 Version: 0.0.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source: %{name}-%{version}.tbz
 #Source1: Makefile
 #Source2: arptables.h
@@ -18,7 +17,7 @@ Patch3: arptables_jf-0.0.8-warnings.patc
 Patch4: arptables_jf-0.0.8-header.patch
 Patch5: arptables_jf-0.0.8-initscript.patch
 
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Group: System Environment/Base
 
@@ -28,7 +27,8 @@ BuildRequires: perl
 
 Requires: kernel >= 2.4.0
 
-Requires(post,postun): chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
 
 %description
 
@@ -39,7 +39,6 @@ requests and/or replies this machine acc
 install this package.
 
 %prep
-rm -rf %{buildroot}
 %setup -q
 %patch1 -p1 -b .2.6-kernel
 %patch2 -p1 -b .man
@@ -51,6 +50,7 @@ rm -rf %{buildroot}
 make all LIBDIR=/%{_lib} 'COPT_FLAGS=%{optflags}' %{_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=%{buildroot} LIBDIR=/%{_lib}
 
 %clean
@@ -72,6 +72,10 @@ fi
 
 
 %changelog
+* Fri Jan 22 2010 Jiri Skala <jskala at redhat.com> - 0.0.8-17
+- moved header patch from sources to cvs
+- fixes merge review findings #225255
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.0.8-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/arptables_jf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Jul 2006 17:49:51 -0000	1.6
+++ sources	22 Jan 2010 14:41:38 -0000	1.7
@@ -1,2 +1 @@
 82bdb1306dca9182e05a10d3f0f520f1  arptables_jf-0.0.8.tbz
-9c96caf85b345d876f0f32ed68f67535  arptables_jf-0.0.8-header.patch