From 90cffba0dad4e918b2f4eb182df173b74e1f6bf1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:42:32 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmicrodns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmicrodns.spec b/libmicrodns.spec index 0615edc..c4e8fc9 100644 --- a/libmicrodns.spec +++ b/libmicrodns.spec @@ -1,6 +1,6 @@ Name: libmicrodns Version: 0.0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Minimal mDNS resolver library License: LGPLv2+ @@ -57,6 +57,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.0.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6d0b275fa5368391dcd59b060ed47a756aa74cf9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 2 Apr 2020 16:48:31 +0200 Subject: [PATCH 2/4] Update to 0.1.2 --- libmicrodns.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libmicrodns.spec b/libmicrodns.spec index c4e8fc9..692886d 100644 --- a/libmicrodns.spec +++ b/libmicrodns.spec @@ -1,13 +1,14 @@ Name: libmicrodns -Version: 0.0.10 -Release: 5%{?dist} +Version: 0.1.2 +Release: 1%{?dist} Summary: Minimal mDNS resolver library License: LGPLv2+ URL: https://github.com/videolabs/libmicrodns Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: libtool +BuildRequires: meson +BuildRequires: gcc %description @@ -25,20 +26,20 @@ developing applications that use %{name}. %prep %autosetup -./bootstrap %build -%configure \ - --disable-static \ - --disable-assert - -%make_build V=1 +%meson +%meson_build %install -%make_install -find %{buildroot} -name '*.la' -exec rm -f {} ';' +%meson_install +#find %{buildroot} -name '*.la' -exec rm -f {} ';' + + +%check +%meson_test %ldconfig_scriptlets @@ -46,8 +47,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %files %license COPYING -%doc AUTHORS NEWS -%{_docdir}/microdns/README.md +%doc AUTHORS NEWS README.md %{_libdir}/libmicrodns.so.0* %files devel @@ -57,6 +57,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Mar 23 2020 Nicolas Chauvet - 0.1.2-1 +- Update to 0.1.2 +- Switch to meson + * Wed Jan 29 2020 Fedora Release Engineering - 0.0.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 52dc20f2fe2e4899ef7dc45b64cad2ad650f6550 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 2 Apr 2020 17:08:03 +0200 Subject: [PATCH 3/4] Update source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 8866cb6..1f87bd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmicrodns-0.0.10.tar.gz) = 003cacb71d3aa8015a233e1ac4b9383ca90ddd5a08983097d082d83dc75f0a7a175646f713bcf4d3ff3f682ac8c4b444ed81ee316549f041a96829a6be6395a4 +SHA512 (libmicrodns-0.1.2.tar.gz) = a2a40f785cfcab280c1d5e187eef5f63e642dccdf1ada2e9f7ed2b85aef26e5c1b1cefc7df6fa4f83b46e5da5eaf05e0f0b02b677ca4e5e73b7fd70d74878552 From d1d7db28844062ba27ea8c9219bf98c7087d44d4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 2 Apr 2020 17:40:07 +0200 Subject: [PATCH 4/4] Lower the meson requirement for rhel --- libmicrodns.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libmicrodns.spec b/libmicrodns.spec index 692886d..747b5fc 100644 --- a/libmicrodns.spec +++ b/libmicrodns.spec @@ -9,6 +9,9 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: meson BuildRequires: gcc +%if 0%{?el7} +BuildRequires: devtoolset-8-toolchain, devtoolset-8-libatomic-devel +%endif %description @@ -26,9 +29,16 @@ developing applications that use %{name}. %prep %autosetup +%if 0%{?rhel} +# lower the meson requirement there +sed -i -e 's/0.50.0/0.47.2/' meson.build +%endif %build +%if 0%{?el7} +. /opt/rh/devtoolset-8/enable +%endif %meson %meson_build