rpms/adns/devel adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns.spec, 1.6, 1.7 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE

[Mihai Ibanescu (misa)]

Author: misa

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31689

Modified Files:
	.cvsignore adns.spec 
Added Files:
	adns-autoconf-noexpand.patch 
Removed Files:
	adns-1.1-parsedomain.patch adns-1.1-semicolon.patch 
Log Message:
Upgraded to 1.2

adns-autoconf-noexpand.patch:

--- NEW FILE adns-autoconf-noexpand.patch ---
--- 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:00:46 -0000	1.2
+++ .cvsignore	15 May 2006 14:13:05 -0000	1.3
@@ -1 +1,2 @@
 adns-1.1.tar.gz
+adns-1.2.tar.gz


Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- adns.spec	6 Apr 2005 22:10:47 -0000	1.6
+++ adns.spec	15 May 2006 14:13:05 -0000	1.7
@@ -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 @@
 
 %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 @@
 %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
 


--- adns-1.1-parsedomain.patch DELETED ---


--- adns-1.1-semicolon.patch DELETED ---