From e2dc92ffeb3542fd78a87c2116d6e9e4f6662e9fa7778012f2839cca1a5c47c5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 6 Jun 2020 06:50:54 +0000 Subject: [PATCH] Accepting request 811067 from home:kstreitova:branches:devel:libraries:c_c++ - add adns-1.5.1-gcc10.patch to fix build with GCC10 - run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/811067 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adns?expand=0&rev=27 --- adns-1.5.1-gcc10.patch | 15 +++++++++++++++ adns.changes | 6 ++++++ adns.spec | 15 +++++++++------ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 adns-1.5.1-gcc10.patch diff --git a/adns-1.5.1-gcc10.patch b/adns-1.5.1-gcc10.patch new file mode 100644 index 0000000..465149a --- /dev/null +++ b/adns-1.5.1-gcc10.patch @@ -0,0 +1,15 @@ +diff -up adns-1.5.1/src/event.c.me adns-1.5.1/src/event.c +diff -up adns-1.5.1/src/internal.h.me adns-1.5.1/src/internal.h +--- adns-1.5.1/src/internal.h.me 2020-02-18 13:54:38.578415675 +0100 ++++ adns-1.5.1/src/internal.h 2020-02-18 14:00:26.398198338 +0100 +@@ -246,7 +246,9 @@ union maxalign { + void *p; + void (*fp)(void); + union maxalign *up; +-} data; ++}; ++ ++extern union maxalign data; + + struct adns__query { + adns_state ads; diff --git a/adns.changes b/adns.changes index 30a890d..b628755 100644 --- a/adns.changes +++ b/adns.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 2 12:48:11 UTC 2020 - Kristyna Streitova + +- add adns-1.5.1-gcc10.patch to fix build with GCC10 +- run spec-cleaner + ------------------------------------------------------------------- Sat Nov 4 20:26:32 UTC 2017 - aavindraa@gmail.com diff --git a/adns.spec b/adns.spec index 014d944..c2bf5d0 100644 --- a/adns.spec +++ b/adns.spec @@ -1,7 +1,7 @@ # # spec file for package adns # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,9 +21,9 @@ Name: adns Version: 1.5.1 Release: 0 Summary: Advanced Easy-to-Use Asynchronous-Capable DNS Utilities -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/DNS/Utilities -Url: http://www.chiark.greenend.org.uk/~ian/adns/ftp/ +URL: https://www.chiark.greenend.org.uk/~ian/adns/ftp/ Source0: http://www.chiark.greenend.org.uk/~ian/adns/ftp/%{name}-%{version}.tar.gz Source1: http://www.chiark.greenend.org.uk/~ian/adns/ftp/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring @@ -32,6 +32,7 @@ Source4: baselibs.conf Patch0: adns-1.4-destdir.patch Patch1: adns-1.4-configure.patch Patch2: adns-visibility.patch +Patch3: adns-1.5.1-gcc10.patch BuildRequires: autoconf %description @@ -63,12 +64,13 @@ programs with libads support. %patch0 %patch1 %patch2 +%patch3 -p1 cp %{SOURCE3} . %build autoreconf -fiv %configure -make %{?_smp_mflags} all +%make_build all %install %make_install @@ -76,7 +78,8 @@ make %{?_smp_mflags} all rm %{buildroot}%{_libdir}/*.a %files -%doc COPYING GPL-vs-LGPL README* TODO changelog +%license COPYING +%doc GPL-vs-LGPL README* TODO changelog %{_bindir}/adns* %files -n %{lname}