- rel 5; switch fully to debian patch

[packages/arpwatch.git] / arpwatch.spec

diff --git a/arpwatch.spec b/arpwatch.spec
index 8af3e8fc766227682a87fb29d9c883e34d6ad590..4bb112c86edbf59c07c99d6628dbe84441be84a4 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -4,7 +4,7 @@ Summary(ru.UTF-8):      Инструмент для отслеживания IP ад
 Summary(uk.UTF-8):     Інструмент для відслідковування IP адрес в локальній мережі
 Name:          arpwatch
 Version:       2.1a15
-Release:       4
+Release:       5
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons
@@ -14,24 +14,11 @@ Source1:    %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       dmassagevendor
 Source4:       dmassagevendor.8
-Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-opt.patch
-Patch10:       %{name}-debian_05debian_fhs.patch
-Patch11:       %{name}-debian_06debian_manpages.patch
-Patch12:       %{name}-debian_10getopt_patchable.patch
-Patch13:       %{name}-debian_11opt_sendmail_path.patch
-Patch14:       %{name}-debian_12opt_nopromisc.patch
-Patch15:       %{name}-debian_13opt_allsubnets.patch
-Patch16:       %{name}-debian_14opt_mailto.patch
-Patch17:       %{name}-debian_15opt_username.patch
-Patch18:       %{name}-debian_16opt_quiet.patch
-Patch19:       %{name}-debian_17opt_ignorenet.patch
-Patch20:       %{name}-debian_21arp2ethers.patch
-Patch21:       %{name}-debian_22secure_tempfile.patch
-Patch22:       %{name}-debian_24from_field.patch
-Patch23:       %{name}-debian_25ignore_zero_ip.patch
-Patch24:       %{name}-debian_26unconf_iface.patch
-Patch25:       ac264.patch
+Patch0:                %{name}-opt.patch
+Patch1:                ftp://ftp.debian.org/debian/pool/main/a/arpwatch/arpwatch_2.1a15-1.2.diff.gz
+# Patch1-md5:  ea6ac9531289f04219349d0faca7cde5
+Patch2:                ac264.patch
+Patch3:                %{name}-makefile.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libpcap-devel
@@ -64,22 +51,8 @@ Dodatkowo tworzona jest baza par adresów ethernet/IP.
 %setup  -q
 %patch0 -p1
 %patch1 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p0
+%patch2 -p0
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -93,7 +66,7 @@ cp -f /usr/share/automake/config.sub .
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/lib/arpwatch,/etc/{rc.d/init.d,sysconfig}} \
-       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_datadir}/%{name}}
+       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_var}/lib/%{name}}
 
 %{__make} install install-man \
        DESTDIR=$RPM_BUILD_ROOT
@@ -102,7 +75,7 @@ install arp2ethers arpfetch $RPM_BUILD_ROOT%{_sbindir}
 install bihourly.sh $RPM_BUILD_ROOT%{_sbindir}/bihourly
 install *.{awk,dat} massagevendor{,-old} %{SOURCE3} $RPM_BUILD_ROOT/var/lib/arpwatch
 install *.8 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
-install ethercodes.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
+install ethercodes.dat $RPM_BUILD_ROOT%{_var}/lib/%{name}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpwatch
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/arpwatch
@@ -126,9 +99,9 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/arpwatch
 %attr(755,root,root) %{_sbindir}/*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/arpwatch
-%{_datadir}/%{name}
 %{_mandir}/man8/*
 %attr(750,daemon,root) %dir /var/lib/arpwatch
 %attr(644,daemon,root) %config(noreplace) %verify(not md5 mtime size) /var/lib/arpwatch/arp.dat
 %attr(755,daemon,root) /var/lib/arpwatch/*.awk
 %attr(755,daemon,root) /var/lib/arpwatch/*massagevendor*
+/var/lib/arpwatch/ethercodes.dat