[packages/adns] - updated to 1.6.0 (GPL v3+ now) - removed outdated DESTDIR patch

qboosh qboosh at pld-linux.org
Sat Jun 20 10:53:21 CEST 2020


commit b1eba99d7fdfc17007decaca4b37a1df711d3156
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 20 10:54:25 2020 +0200

    - updated to 1.6.0 (GPL v3+ now)
    - removed outdated DESTDIR patch

 adns-DESTDIR.patch | 76 ------------------------------------------------------
 adns.spec          | 16 +++++-------
 2 files changed, 6 insertions(+), 86 deletions(-)
---
diff --git a/adns.spec b/adns.spec
index 018c7cc..4987315 100644
--- a/adns.spec
+++ b/adns.spec
@@ -3,13 +3,12 @@ Summary(pl.UTF-8):	Zaawansowana, prosta w użyciu, asynchroniczna biblioteka kli
 Summary(ru.UTF-8):	Клиентская библиотека DNS с возможностью асинхронных запросов
 Summary(uk.UTF-8):	Клієнтська бібліотека DNS з можливістю асинхронних запитів
 Name:		adns
-Version:	1.5.1
+Version:	1.6.0
 Release:	1
-License:	GPL v2+
+License:	GPL v3+
 Group:		Libraries
-Source0:	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz
-# Source0-md5:	8b6274d314af0de1a00cf3ef49f6dd56
-Patch0:		%{name}-DESTDIR.patch
+Source0:	http://www.chiark.greenend.org.uk/~ian/adns/ftp/%{name}-%{version}.tar.gz
+# Source0-md5:	b01ba30e4b486d523059bb02ad1441f3
 URL:		http://www.chiark.greenend.org.uk/~ian/adns/
 BuildRequires:	autoconf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,7 +38,7 @@ following features:
   environment variables (for setuid programs), disable sanity checks eg
   to return arbitrary data, override or ignore resolv.conf in favour of
   supplied configuration, etc.
-- Believed to be correct ! For example, will correctly back off to TCP
+- Believed to be correct! For example, will correctly back off to TCP
   in case of long replies or queries, or to other nameservers if several
   are available. It has sensible handling of bad responses etc.
 
@@ -201,7 +200,6 @@ użytku z linii poleceń lub w skryptach:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # aclocal.m4 is only local, don't run aclocal
@@ -216,8 +214,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libadns.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libadns.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -226,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO changelog
+%doc GPL-vs-LGPL NEWS README TODO changelog
 %attr(755,root,root) %{_libdir}/libadns.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libadns.so.1
 
diff --git a/adns-DESTDIR.patch b/adns-DESTDIR.patch
deleted file mode 100644
index 1a4fe41..0000000
--- a/adns-DESTDIR.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur adns-1.3/Makefile.in adns-1.3.new/Makefile.in
---- adns-1.3/Makefile.in	2006-06-06 21:27:17.000000000 +0200
-+++ adns-1.3.new/Makefile.in	2006-07-27 17:23:51.028362250 +0200
-@@ -37,7 +37,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 -Nur adns-1.3/client/Makefile.in adns-1.3.new/client/Makefile.in
---- adns-1.3/client/Makefile.in	2006-05-10 12:58:02.000000000 +0200
-+++ adns-1.3.new/client/Makefile.in	2006-07-27 17:26:05.012735750 +0200
-@@ -58,12 +58,12 @@
- all:		$(TARGETS)
- 
- install:	$(TARG_INSTALL)
--		mkdir -p $(bindir)
-+		$(INSTALL) -d $(DESTDIR)$(bindir)
- 		set -xe; for f in $(TARG_INSTALL); \
--			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
-+			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
- 
- uninstall:
--		for f in $(TARGETS); do rm -f $(bindir)/$$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 -Nur adns-1.3/dynamic/Makefile.in adns-1.3.new/dynamic/Makefile.in
---- adns-1.3/dynamic/Makefile.in	2006-05-10 12:58:02.000000000 +0200
-+++ adns-1.3.new/dynamic/Makefile.in	2006-07-27 17:33:55.370131250 +0200
-@@ -30,13 +30,13 @@
- ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
- 
- install:
--		mkdir -p $(libdir)
--		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
--		ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
--		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
-+		$(INSTALL) -d $(DESTDIR)$(libdir)
-+		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
-+		ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
-+		ln -sf $(SHLIBSONAME) $(DESTDIR)$(libdir)/$(SHLIBFORLINK)
- 
- uninstall:
--		rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
-+		rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
- 
- $(SHLIBFORLINK):
- 		ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
-diff -Nur adns-1.3/src/Makefile.in adns-1.3.new/src/Makefile.in
---- adns-1.3/src/Makefile.in	2006-05-10 12:58:03.000000000 +0200
-+++ adns-1.3.new/src/Makefile.in	2006-07-27 17:30:52.670713250 +0200
-@@ -28,14 +28,14 @@
- include		adns.make
- 
- install:
--		mkdir -p $(libdir) $(includedir)
-+		$(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
- 		set -xe; for f in $(TARGETS); \
--			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
--		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/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 $(libdir)/$$f; done
--		rm -f $(includedir)/adns.h
-+		for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done
-+		rm -f $(DESTDIR)$(includedir)/adns.h
- 
- ALLOBJS=	$(LIBOBJS)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adns.git/commitdiff/b1eba99d7fdfc17007decaca4b37a1df711d3156



More information about the pld-cvs-commit mailing list