[dnscap] Update to 134

[Adam Tkac]

commit ad265a64f13007bed71b180d7422d7dcdfe22d20
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Jan 6 13:45:08 2012 +0100

    Update to 134
    
    - patches merged:
      - dnscap-1.0-isc_list.patch
      - dnscap-1.0-warns.patch
      - dnscap-1.0-system.patch
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                 |    1 +
 dnscap-1.0-isc_list.patch  |  406 --------------------------------------------
 dnscap-1.0-system.patch    |   13 --
 dnscap-1.0-warns.patch     |   12 --
 dnscap.spec                |   27 ++--
 dnscap134-installfix.patch |   20 +++
 sources                    |    2 +-
 7 files changed, 36 insertions(+), 445 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7958259..368ff6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 dnscap-20070807cvs.tar.bz2
+/dnscap-134.tar.gz
diff --git a/dnscap.spec b/dnscap.spec
index e98bf8d..f1d387f 100644
--- a/dnscap.spec
+++ b/dnscap.spec
@@ -1,20 +1,18 @@
 Name:           dnscap
-Version:        1.0
-Release:        0.11.20070807cvs%{?dist}
+Version:        134
+Release:        1%{?dist}
 Summary:        DNS traffic capture utility
 
 Group:          Applications/Internet
 License:        ISC
 URL:            http://public.oarci.net/tools/dnscap
-Source0:        dnscap-20070807cvs.tar.bz2
+Source0:        http://dnscap.dns-oarc.net/dnscap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap-devel, libbind-devel, autoconf, automake, libtool
 BuildRequires:  groff, pkgconfig
 
-Patch0:         dnscap-1.0-isc_list.patch
-Patch1:         dnscap-1.0-warns.patch
-Patch2:         dnscap-1.0-system.patch
+Patch0: dnscap134-installfix.patch
 
 %description
 dnscap is a network capture utility designed specifically for DNS traffic. It
@@ -23,13 +21,9 @@ successive dump files. This utility is similar to tcpdump(1), but has finer
 grained packet recognition tailored to DNS transactions and protocol options
 
 %prep
-%setup -q -n dnscap-20070807cvs
+%setup -q
 
-sed -i 's/-Werror//' configure.ac
-
-%patch0 -p1 -b .isc_list
-%patch1 -p1 -b .warns
-%patch2 -p1 -b .system
+%patch0 -p1 -b .installfix
 
 %build
 autoreconf --install
@@ -45,10 +39,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_sbindir}/dnscap
+%{_bindir}/dnscap
 %{_mandir}/man1/dnscap.1.gz
 
 %changelog
+* Fri Jan 06 2012 Adam Tkac <atkac redhat com> 134-1
+- update to 134
+- patches merged:
+  - dnscap-1.0-isc_list.patch
+  - dnscap-1.0-warns.patch
+  - dnscap-1.0-system.patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.11.20070807cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/dnscap134-installfix.patch b/dnscap134-installfix.patch
new file mode 100644
index 0000000..798d5f8
--- /dev/null
+++ b/dnscap134-installfix.patch
@@ -0,0 +1,20 @@
+diff -up dnscap-134/Makefile.in.installfix dnscap-134/Makefile.in
+--- dnscap-134/Makefile.in.installfix	2012-01-06 13:18:32.207596332 +0100
++++ dnscap-134/Makefile.in	2012-01-06 13:19:58.580734469 +0100
+@@ -45,11 +45,11 @@ OBJS=	${prog}.o \
+ all: ${prog} ${prog}.cat1
+ 
+ install: all
+-	mkdir -p ${bindir} ${mandir}
+-	if [ -f ${bindir}/${prog} ]; then \
+-		mv -f ${bindir}/${prog} ${bindir}/${prog}.old; fi
+-	cp ${prog} ${bindir}
+-	cp ${prog}.cat1 /usr/local/man/cat1/${prog}.1
++	mkdir -p ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1
++	if [ -f ${DESTDIR}${bindir}/${prog} ]; then \
++		mv -f ${DESTDIR}${bindir}/${prog} ${DESTDIR}${bindir}/${prog}.old; fi
++	cp ${prog} ${DESTDIR}${bindir}
++	cp ${prog}.1 ${DESTDIR}${mandir}/man1
+ 
+ .c.o:
+ 	${CC} ${CFLAGS} -c $<
diff --git a/sources b/sources
index 75aa5c3..1a0bd95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25c13ea648409f1e392f48f1e85efeb4  dnscap-20070807cvs.tar.bz2
+7d5086fe97760a4abe156e9a32c63865  dnscap-134.tar.gz