rpms/adns/FC-5 adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns-DESTDIR.patch, 1.1, 1.2 adns.spec, 1.6, 1.7 sources, 1.2, 1.3 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE
Mihai Ibanescu (misa)
fedora-extras-commits at redhat.com
Mon May 8 17:50:06 UTC 2006
Author: misa
Update of /cvs/extras/rpms/adns/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6041
Modified Files:
.cvsignore adns-DESTDIR.patch adns.spec sources
Added Files:
adns-autoconf-noexpand.patch
Removed Files:
adns-1.1-parsedomain.patch adns-1.1-semicolon.patch
Log Message:
Upgrading 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/FC-5/.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 8 May 2006 17:50:06 -0000 1.3
@@ -1 +1,2 @@
adns-1.1.tar.gz
+adns-1.2.tar.gz
adns-DESTDIR.patch:
Index: adns-DESTDIR.patch
===================================================================
RCS file: /cvs/extras/rpms/adns/FC-5/adns-DESTDIR.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adns-DESTDIR.patch 8 Nov 2004 04:00:46 -0000 1.1
+++ adns-DESTDIR.patch 8 May 2006 17:50:06 -0000 1.2
@@ -1,7 +1,6 @@
-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 @@
+--- adns-1.2/Makefile.in.destdir 2006-04-08 10:37:21.000000000 -0400
++++ adns-1.2/Makefile.in 2006-05-08 10:11:16.000000000 -0400
+@@ -37,7 +37,7 @@
SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
all install uninstall clean distclean mostlyclean maintainer-clean distprep:
@@ -10,79 +9,64 @@
$(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 @@
+--- adns-1.2/src/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400
++++ adns-1.2/src/Makefile.in 2006-05-08 10:12:22.000000000 -0400
+@@ -28,14 +28,14 @@
include adns.make
install:
-+ $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+- mkdir -p $(lib_dir) $(include_dir)
++ mkdir -p $(DESTDIR)$(lib_dir) $(DESTDIR)$(include_dir)
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
++ do $(INSTALL_DATA) $$f $(DESTDIR)$(lib_dir)/$$f; done
++ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(include_dir)/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
++ for f in $(TARGETS); do rm -f $(DESTDIR)$(lib_dir)/$$f; done
++ rm -f $(DESTDIR)$(include_dir)/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 @@
+--- adns-1.2/client/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400
++++ adns-1.2/client/Makefile.in 2006-05-08 10:12:56.000000000 -0400
+@@ -58,12 +58,12 @@
+ all: $(TARGETS)
+
+ install: $(TARG_INSTALL)
+- mkdir -p $(bin_dir)
++ mkdir -p $(DESTDIR)$(bin_dir)
+ set -xe; for f in $(TARG_INSTALL); \
+- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
++ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bin_dir)/$$f; done
+
+ uninstall:
+- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
++ for f in $(TARGETS); do rm -f $(DESTDIR)$(bin_dir)/$$f; done
+
+ adnshost: $(ADH_OBJS) $(DYNAMIC_DEP)
+ $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+--- adns-1.2/dynamic/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400
++++ adns-1.2/dynamic/Makefile.in 2006-05-08 10:12:32.000000000 -0400
+@@ -30,13 +30,13 @@
ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS)))
install:
+- mkdir -p $(lib_dir)
- $(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)
+- ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK)
++ mkdir -p $(DESTDIR)$(lib_dir)
++ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBFILE)
++ ln -sf $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME)
++ ln -sf $(SHLIBSONAME) $(DESTDIR)$(lib_dir)/$(SHLIBFORLINK)
uninstall:
- rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
-+ rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
++ rm -f $(DESTDIR)$(lib_dir)/$(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME)
$(SHLIBFORLINK):
ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/FC-5/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 8 May 2006 17:50:06 -0000 1.7
@@ -1,18 +1,17 @@
Name: adns
-Version: 1.1
-Release: 5
+Version: 1.2
+Release: 1
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
+Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.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
+Patch1: %{name}-ac_fix.patch
+Patch2: %{name}-autoconf-noexpand.patch
+#BuildRequires: autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -72,16 +71,13 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .semicolon
-%patch3 -p1 -b .parsedomain
+%patch0 -p1 -b .destdir
+%patch1 -p1 -b .ac_fix
+%patch2 -p1 -b .noexpand
%build
#aclocal
#%{__autoconf}
-aclocal-1.5
-autoconf-2.13
%configure --enable-dynamic
make %{?_smp_mflags}
@@ -112,6 +108,11 @@
%attr(755,root,root) %{_bindir}/*
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/adns/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:00:46 -0000 1.2
+++ sources 8 May 2006 17:50:06 -0000 1.3
@@ -1 +1 @@
-891956e305acf5fc83b099333bf3ffd9 adns-1.1.tar.gz
+4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz
--- adns-1.1-parsedomain.patch DELETED ---
--- adns-1.1-semicolon.patch DELETED ---
More information about the fedora-extras-commits
mailing list