From 088b9b4b97fedd2e43756ef2ded293ad1f76f150 Mon Sep 17 00:00:00 2001
From: Mihai Ibanescu <misa@fedoraproject.org>
Date: May 15 2006 14:13:05 +0000
Subject: Upgraded to 1.2


---

diff --git a/.cvsignore b/.cvsignore
index 8e65392..571b863 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 adns-1.1.tar.gz
+adns-1.2.tar.gz
diff --git a/adns-1.1-parsedomain.patch b/adns-1.1-parsedomain.patch
deleted file mode 100644
index 03f0c52..0000000
--- a/adns-1.1-parsedomain.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- adns-1.1/src/parse.c	2003-06-22 06:01:11.000000000 -0700
-+++ parse.c	2004-07-02 00:30:02.479995816 -0700
-@@ -113,7 +113,7 @@
- }
- 
- adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
--			       vbuf *vb, adns_queryflags flags,
-+			       vbuf *vb, parsedomain_flags flags,
- 			       const byte *dgram, int dglen, int *cbyte_io,
- 			       int max) {
-   findlabel_state fls;
diff --git a/adns-1.1-semicolon.patch b/adns-1.1-semicolon.patch
deleted file mode 100644
index a11dd98..0000000
--- a/adns-1.1-semicolon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur adns-1.1.vanilla/src/setup.c adns-1.1/src/setup.c
---- adns-1.1.vanilla/src/setup.c	2003-06-22 15:01:11.000000000 +0200
-+++ adns-1.1/src/setup.c	2004-05-20 20:00:59.241027745 +0200
-@@ -416,7 +416,7 @@
-     linebuf[l]= 0;
-     p= linebuf;
-     while (ctype_whitespace(*p)) p++;
--    if (*p == '#' || !*p) continue;
-+    if (*p == '#' || *p == ';' || !*p) continue;
-     q= p;
-     while (*q && !ctype_whitespace(*q)) q++;
-     dirl= q-p;
diff --git a/adns-autoconf-noexpand.patch b/adns-autoconf-noexpand.patch
new file mode 100644
index 0000000..efd5b41
--- /dev/null
+++ b/adns-autoconf-noexpand.patch
@@ -0,0 +1,15 @@
+--- adns-1.2/settings.make.in.noexpand	2006-05-08 10:24:44.000000000 -0400
++++ adns-1.2/settings.make.in	2006-05-08 10:25:46.000000000 -0400
+@@ -47,9 +47,9 @@
+ 
+ prefix=		@prefix@
+ exec_prefix=	@exec_prefix@
+-bin_dir=	$(exec_prefix)/bin
+-lib_dir=	$(exec_prefix)/lib
+-include_dir=	$(prefix)/include
++bin_dir=	@bindir@
++lib_dir=	@libdir@
++include_dir=	@includedir@
+ 
+ AC_INSTALL=	@INSTALL@
+ ifeq ($(AC_INSTALL),./install-sh -c)
diff --git a/adns.spec b/adns.spec
index 857ecd7..9ab1b49 100644
--- a/adns.spec
+++ b/adns.spec
@@ -1,18 +1,16 @@
 Name:		adns
-Version:	1.1
-Release:	5
+Version:	1.2
+Release:	2%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://www.chiark.greenend.org.uk/~ian/adns/
-Source0:	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-1.1.tar.gz
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-ac_fix.patch
-Patch2:		adns-1.1-semicolon.patch
-Patch3:		adns-1.1-parsedomain.patch
-BuildRequires:	autoconf213 automake15
+Source0:        ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz
+Patch1:         %{name}-ac_fix.patch
+Patch2:         %{name}-autoconf-noexpand.patch
+#BuildRequires:	autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -72,23 +70,23 @@ programs for use from the command line and in scripts:
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .semicolon
-%patch3 -p1 -b .parsedomain
+%patch1 -p1 -b .ac_fix
+%patch2 -p1 -b .noexpand
 
 %build
 #aclocal
 #%{__autoconf}
-aclocal-1.5
-autoconf-2.13
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
 %configure --enable-dynamic
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-ln -sf libadns.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libadns.so
+make install \
+    prefix=$RPM_BUILD_ROOT/usr \
+    bin_dir=$RPM_BUILD_ROOT%{_bindir} \
+    include_dir=$RPM_BUILD_ROOT%{_includedir} \
+    lib_dir=$RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -112,6 +110,16 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue May  9 2006 Mihai Ibanescu <misa[AT]redhat.com> 1.2-2
+- Dropped the DESTDIR patch since it was not accepted upstream.
+- Added -fPIC in the compiled flags, otherwise we won't be able to link
+  against this library.
+
+* Mon May  8 2006 Mihai Ibanescu <misa[AT]redhat.com> 1.2-1
+- Updated to 1.2, some of the patches were already upstream
+- Removed dependency on autoconf/automake since it builds just fine without
+  that
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt