- updated to 1.4

- CVS cleanup
2007-12-19 11:45:18 +00:00 · 2007-12-19 11:45:18 +00:00 · 922070637f
commit 922070637f
parent 9d033bdd49
6 changed files with 8 additions and 123 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1 @@
-adns-1.1.tar.gz
-adns-1.2.tar.gz
+adns-1.4.tar.gz
--- a/adns-DESTDIR.patch
+++ b/adns-DESTDIR.patch
@ -1,88 +0,0 @@
-diff -Nru adns-1.0/Makefile.in adns-1.0.new/Makefile.in
--- adns-1.0/Makefile.in	Sun Sep 17 16:10:57 2000
-+++ adns-1.0.new/Makefile.in	Mon Nov 19 02:34:14 2001
-@@ -38,7 +38,7 @@
- SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
- 
- all install uninstall clean distclean mostlyclean maintainer-clean distprep:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-+	set -e; for d in $(SUBDIRS); do $(MAKE) DESTDIR=$(DESTDIR) -C $$d $@; done
- 	$(MAKE) $@-here
- 
- all-here install-here uninstall-here distprep-here:	README
-diff -Nru adns-1.0/client/Makefile.in adns-1.0.new/client/Makefile.in
--- adns-1.0/client/Makefile.in	Sun Sep 17 02:43:10 2000
-+++ adns-1.0.new/client/Makefile.in	Mon Nov 19 02:36:50 2001
-@@ -59,11 +59,12 @@
- all:		$(TARGETS)
- 
- install:	$(TARG_INSTALL)
-+		$(INSTALL) -d $(DESTDIR)$(bindir)
- 		set -xe; for f in $(TARG_INSTALL); \
-			do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
-+			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
- 
- uninstall:
-		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
-+		for f in $(TARGETS); do rm -f $(DESTDIR)$(bindir)/$$f; done
- 
- adnshost:	$(ADH_OBJS) $(DYNAMIC_DEP)
- 		$(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
-diff -Nru adns-1.0/settings.make.in adns-1.0.new/settings.make.in
--- adns-1.0/settings.make.in	Sun Sep 17 03:01:11 2000
-+++ adns-1.0.new/settings.make.in	Mon Nov 19 02:36:25 2001
-@@ -47,10 +47,10 @@
- MKSHLIB_3=	@MKSHLIB_3@
- 
- prefix=		@prefix@
-exec_prefix=	@exec_prefix@
-bin_dir=	$(exec_prefix)/bin
-lib_dir=	$(exec_prefix)/lib
-include_dir=	$(prefix)/include
-+execprefix=	@execprefix@
-+bindir=		@bindir@
-+libdir=		@libdir@
-+includedir=	@includedir@
- 
- AC_INSTALL=	@INSTALL@
- ifeq ($(AC_INSTALL),./install-sh -c)
-diff -Nru adns-1.0/src/Makefile.in adns-1.0.new/src/Makefile.in
--- adns-1.0/src/Makefile.in	Sun Sep 17 02:24:24 2000
-+++ adns-1.0.new/src/Makefile.in	Mon Nov 19 02:35:18 2001
-@@ -29,13 +29,14 @@
- include		adns.make
- 
- install:
-+		$(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
- 		set -xe; for f in $(TARGETS); \
-			do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
-		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
-+			do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
-+		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
- 
- uninstall:
-		for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done
-		rm -f $(include_dir)/adns.h
-+		for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done
-+		rm -f $(DESTDIR)$(includedir)/adns.h
- 
- ALLOBJS=	$(LIBOBJS)
- 
--- adns-1.0/dynamic/Makefile.in~	Mon Nov 19 03:01:54 2001
-+++ adns-1.0/dynamic/Makefile.in	Mon Nov 19 03:01:54 2001
-@@ -31,11 +31,12 @@
- ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
- 
- install:
-		$(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE)
-		ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
-+		$(INSTALL) -d $(DESTDIR)$(libdir)
-+		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
-+		ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
- 
- uninstall:
-		rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
-+		rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
- 
- $(SHLIBFORLINK):
- 		ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
--- a/adns-ac_fix.patch
+++ b/adns-ac_fix.patch
@ -1,11 +0,0 @@
--- adns-1.0/configure.in~	Mon Nov 19 02:41:12 2001
-+++ adns-1.0/configure.in	Mon Nov 19 02:41:12 2001
-@@ -25,7 +25,7 @@
- AC_CONFIG_HEADER(src/config.h)
- 
- dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-define(DPKG_CACHED_TRY_COMPILE,[
-+define([DPKG_CACHED_TRY_COMPILE],[
-  AC_MSG_CHECKING($1)
-  AC_CACHE_VAL($2,[
-   AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
--- a/adns-autoconf-noexpand.patch
+++ b/adns-autoconf-noexpand.patch
@ -1,15 +0,0 @@
--- 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)
--- a/adns.spec
+++ b/adns.spec
@ -1,6 +1,6 @@
 Name:		adns
-Version:	1.2
-Release:	6%{?dist}
+Version:	1.4
+Release:	1%{?dist}

 Summary:	Advanced, easy to use, asynchronous-capable DNS client library

@ -8,8 +8,6 @@ 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/%{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)

@ -70,8 +68,6 @@ programs for use from the command line and in scripts:

 %prep
 %setup -q
-%patch1 -p1 -b .ac_fix
-%patch2 -p1 -b .noexpand

 %build
 #aclocal
@ -110,6 +106,10 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*

 %changelog
+* Wed Dec 19 2007 Adam Tkac <atkac redhat com> 1.4-1
+- updated to 1.4
+- CVS cleanup
+
 * Fri Aug 31 2007 Radek Vokál <rvokal@redhat.com> 1.2-6
 - rebuilt

--- a/2
+++ b/2
@ -1 +1 @@
-4d9ad052125ddd295ee75ea608b992b7  adns-1.2.tar.gz
+88bc7bbf3f62a8d4fb186b8f72ead853  adns-1.4.tar.gz