From bbd60fa46d21338de6ccf725f498a81facd1ddac Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 4 Feb 2021 09:51:24 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libidn.git#44cbc00ed73fb440a59f99cb535c4b42fe14de45
---
 libidn.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/libidn.spec b/libidn.spec
index d6bad40..ac8d511 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -6,7 +6,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 1.36
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+ and GPLv3+ and GFDL
 Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
@@ -56,6 +56,7 @@ BuildRequires: javapackages-local
 BuildRequires: mvn(com.google.code.findbugs:annotations)
 BuildRequires: mvn(com.google.guava:guava)
 BuildRequires: mvn(junit:junit)
+BuildRequires: make
 BuildArch:     noarch
 
 %description java
@@ -110,22 +111,22 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 # without RPATH this needs to be set for idn executed by help2man
 export LD_LIBRARY_PATH=$(pwd)/lib/.libs
 
-make %{?_smp_mflags} V=1
+%make_build
 
 %check
 # without RPATH this needs to be set to test the compiled library
 export LD_LIBRARY_PATH=$(pwd)/lib/.libs
-make %{?_smp_mflags} -C tests check VALGRIND=env
+%make_build -C tests check VALGRIND=env
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig \
+%make_install pkgconfigdir=%{_libdir}/pkgconfig \
 %if %{with libidn_enables_java}
     libidn_jardir=%{_javadir} \
 %endif
     ;
 
 # provide more examples
-make %{?_smp_mflags} -C examples distclean
+%make_build -C examples distclean
 
 # clean up docs
 find doc -name "Makefile*" | xargs rm
@@ -184,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
 %endif
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.36-1
 - update to 1.36