[arptables_jf] /usr move: use _sbindir macro

[Jiří Popelka]

commit 78edb2e6a7f961603863a915837e6b0c86616daf
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Nov 28 15:27:58 2012 +0100

    /usr move: use _sbindir macro

 arptables_jf-0.0.8-initscript.patch |  285 -----------------------------------
 arptables_jf.spec                   |   31 ++--
 2 files changed, 14 insertions(+), 302 deletions(-)
---
diff --git a/arptables_jf.spec b/arptables_jf.spec
index 2aa1754..eb700b9 100644
--- a/arptables_jf.spec
+++ b/arptables_jf.spec
@@ -1,9 +1,7 @@
 Summary: User-space control program for the arptables network filter
-
 Name:    arptables_jf
-
 Version: 0.0.8
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 
@@ -16,11 +14,9 @@ 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
 Patch4: arptables_jf-0.0.8-header.patch
-#Patch5: arptables_jf-0.0.8-initscript.patch
-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
-
+Patch5: arptables_jf-0.0.8-mangle.patch
+Patch6: arptables_jf-0.0.8-byteorder.patch
+Patch7: arptables_jf-0.0.8-dbl-opt.patch
 
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -43,16 +39,15 @@ written by Jay Fenlason.
 %patch2 -p1 -b .man
 %patch3 -p1 -b .warnings
 %patch4 -p1 -b .header
-#%%patch5 -p1 -b .initscript
-%patch6 -p1 -b .mangle
-%patch7 -p1 -b .byteorder
-%patch8 -p1 -b .dbl-opt
+%patch5 -p1 -b .mangle
+%patch6 -p1 -b .byteorder
+%patch7 -p1 -b .dbl-opt
 
 %build
-make all LIBDIR=/%{_lib} 'COPT_FLAGS=%{optflags} -fno-strict-aliasing' %{_smp_mflags}
+make all BINDIR=%{_sbindir} 'COPT_FLAGS=%{optflags} -fno-strict-aliasing' %{_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} LIBDIR=/%{_lib}
+make install DESTDIR=%{buildroot} BINDIR=%{_sbindir}
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/arptables.service
 mkdir -p %{buildroot}%{_libexecdir}/
 install -D -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/
@@ -60,7 +55,6 @@ rm -rf %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
 
-
 %post
 %systemd_post arptables.service
 
@@ -70,7 +64,6 @@ echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
 %postun
 %systemd_postun_with_restart arptables.service
 
-
 %triggerun -- arptables_jf < 0.0.8-25
 # Save the current service runlevel info
 # User must manually run systemd-sysv-convert --apply arptables
@@ -83,13 +76,17 @@ echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
 
 
 %files
-/sbin/arptables*
+%{_sbindir}/arptables*
 %{_libexecdir}/arptables-helper
 %{_mandir}/*/arptables*
 %{_unitdir}/arptables.service
 %config(noreplace) %{_sysconfdir}/sysconfig/arptables
 
 %changelog
+* Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-30
+- /usr move: use _sbindir macro
+- removed unused initscript.patch
+
 * Wed Aug 22 2012 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-29
 - use new systemd-rpm macros (#850031)