From 81329c3ca8e889fd4c5327829153483fe81df49f Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Apr 25 2019 12:04:30 +0000
Subject: Replace deprecated __global_ldflags uses with build_ldflags macro


---

diff --git a/rpm-4.13.90-ldflags.patch b/rpm-4.13.90-ldflags.patch
index ad65430..6bc234d 100644
--- a/rpm-4.13.90-ldflags.patch
+++ b/rpm-4.13.90-ldflags.patch
@@ -5,7 +5,7 @@ diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in
    RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
    RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
    RPM_OPT_FLAGS=\"%{optflags}\"\
-+  RPM_LD_FLAGS=\"%{?__global_ldflags}\"\
++  RPM_LD_FLAGS=\"%{?build_ldflags}\"\
    RPM_ARCH=\"%{_arch}\"\
    RPM_OS=\"%{_os}\"\
 -  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
diff --git a/rpm.spec b/rpm.spec
index 5abd401..16be87f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -23,7 +23,7 @@
 
 %global rpmver 4.14.2.1
 #global snapver rc2
-%global rel 7
+%global rel 8
 
 %global srcver %{version}%{?snapver:-%{snapver}}
 %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
@@ -343,7 +343,7 @@ sed -ie 's:python -c:python2 -c:g' tests/atlocal.in
 %endif
 CPPFLAGS="$CPPFLAGS -DLUA_COMPAT_APIINTCASTS"
 CFLAGS="$RPM_OPT_FLAGS %{?sanitizer_flags} -DLUA_COMPAT_APIINTCASTS"
-LDFLAGS="$LDFLAGS %{?__global_ldflags}"
+LDFLAGS="$LDFLAGS %{?build_ldflags}"
 export CPPFLAGS CFLAGS LDFLAGS
 
 autoreconf -i -f
@@ -576,6 +576,9 @@ make check || (cat tests/rpmtests.log; exit 1)
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 25 2019 Panu Matilainen <pmatilai@redhat.com> - 4.14.2.1-8
+- Replace deprecated __global_ldflags uses with build_ldflags macro
+
 * Thu Apr 11 2019 Panu Matilainen <pmatilai@redhat.com> - 4.14.2.1-7
 - Fix excessive reference counting on faked string .decode()