[arptables_jf] no need to Buildrequire perl (#225255)
Jiří Popelka
jpopelka at fedoraproject.org
Wed May 16 17:38:51 UTC 2012
commit 75ccb447e3358a521aee8ee35ab2f2a933e9ecbe
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Wed May 16 19:22:50 2012 +0200
no need to Buildrequire perl (#225255)
- improved description
- No need to define BuildRoot and clean it in clean and install section anymore.
- %defattr no longer needed in %files sections.
arptables-helper | 1 +
arptables_jf.spec | 53 +++++++++++++++++++++++------------------------------
2 files changed, 24 insertions(+), 30 deletions(-)
---
diff --git a/arptables-helper b/arptables-helper
old mode 100755
new mode 100644
index 5afc5cc..6900cb1
--- a/arptables-helper
+++ b/arptables-helper
@@ -127,6 +127,7 @@ condrestart|try-restart|force-reload)
[ -e /var/lock/subsys/arptables ] && start
;;
+*)
exit 2
esac
diff --git a/arptables_jf.spec b/arptables_jf.spec
index 55a2574..a815517 100644
--- a/arptables_jf.spec
+++ b/arptables_jf.spec
@@ -1,18 +1,17 @@
-Summary: Userspace control program for the arptables network filter
+Summary: User-space control program for the arptables network filter
-Name: arptables_jf
+Name: arptables_jf
Version: 0.0.8
-Release: 25%{?dist}
-Source: %{name}-%{version}.tbz
-#Source1: Makefile
-#Source2: arptables.h
-#Source3: arptables.8
-#Source4: libarptc.c
-#Source5: libarptc.h
-#Source6: arptables.init
-Source7: arptables.service
-Source8: arptables-helper
+Release: 26%{?dist}
+License: GPLv2+
+Group: System Environment/Base
+
+# There's no Url tag here because there's no upstream.
+Source0: %{name}-%{version}.tbz
+Source1: arptables.service
+Source2: arptables-helper
+
Patch1: arptables_jf-0.0.8-2.6-kernel.patch
Patch2: arptables_jf-0.0.8-man.patch
Patch3: arptables_jf-0.0.8-warnings.patch
@@ -22,15 +21,6 @@ Patch6: arptables_jf-0.0.8-mangle.patch
Patch7: arptables_jf-0.0.8-byteorder.patch
Patch8: arptables_jf-0.0.8-dbl-opt.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group: System Environment/Base
-
-License: GPLv2+
-
-BuildRequires: perl
-
-Requires: kernel >= 2.4.0
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -38,20 +28,22 @@ Requires(postun): systemd-units
Requires(post): systemd-sysv
%description
-
The arptables_jf utility controls the arpfilter network packet filtering
code in the Linux kernel. You do not need this program for normal
network firewalling. If you need to manually control which arp
requests and/or replies this machine accepts and sends, you should
install this package.
+Arptables_jf is a fork of arptables from ebtables.sourceforge.net
+written by Jay Fenlason.
+
%prep
%setup -q
%patch1 -p1 -b .2.6-kernel
%patch2 -p1 -b .man
%patch3 -p1 -b .warnings
%patch4 -p1 -b .header
-#%patch5 -p1 -b .initscript
+#%%patch5 -p1 -b .initscript
%patch6 -p1 -b .mangle
%patch7 -p1 -b .byteorder
%patch8 -p1 -b .dbl-opt
@@ -60,18 +52,14 @@ install this package.
make all LIBDIR=/%{_lib} 'COPT_FLAGS=%{optflags}' %{_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot} LIBDIR=/%{_lib}
-install -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/arptables.service
-install -D -m 755 %{SOURCE8} %{buildroot}/sbin/
+install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/arptables.service
+install -D -m 755 %{SOURCE2} %{buildroot}/sbin/
rm -rf %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -104,13 +92,18 @@ fi
%files
-%defattr(-,root,root,0755)
/sbin/arptables*
%{_mandir}/*/arptables*
%{_unitdir}/arptables.service
%config(noreplace) %{_sysconfdir}/sysconfig/arptables
%changelog
+* Wed May 16 2012 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-26
+- no need to Buildrequire perl (#225255)
+- improved description
+- No need to define BuildRoot and clean it in clean and install section anymore.
+- %%defattr no longer needed in %%files sections.
+
* Fri May 11 2012 Jon Ciesla <limburgher at gmail.com> - 0.0.8-25
- Migrate to systemd, BZ 754423.
More information about the scm-commits
mailing list