[Arch-excludes] Architecture specific change in rpms/openldap.git

The package rpms/openldap.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openldap.git/commit/?id=cd7bdcf82....

Change:
-%ifarch s390 s390x

Thanks.


Full change:
============

commit 6f8a4c6436709dd6c43c64e8006bc26946cab63f
Author: Matúš Honěk <mhonek(a)redhat.com&gt;
Date:   Wed Feb 28 14:26:58 2018 +0100

    Drop superfluous back-sql linking patch
    
    This patch is not needed any more as we do not build with back-sql at
    all.
    
    Related: #1548676

diff --git a/openldap-sql-linking.patch b/openldap-sql-linking.patch
deleted file mode 100644
index c7edf8c..0000000
--- a/openldap-sql-linking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers
package
-independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.)
-
---- openldap-2.4.24.orig/build/top.mk
-+++ openldap-2.4.24/build/top.mk
-@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
- SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
- SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
- 
--SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@
@SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
-+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
$(ICU_LIBS)
- 
- # Our Defaults
- CC = $(AC_CC)
diff --git a/openldap.spec b/openldap.spec
index 402f813..d1bdade 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -29,7 +29,6 @@ Source53: libexec-upgrade-db.sh
 
 # patches for 2.4
 Patch0: openldap-manpages.patch
-Patch1: openldap-sql-linking.patch
 Patch2: openldap-reentrant-gethostby.patch
 Patch3: openldap-smbk5pwd-overlay.patch
 Patch5: openldap-ai-addrconfig.patch
@@ -128,7 +127,6 @@ ln -s %{_includedir}/nspr4 include/nspr
 AUTOMAKE=%{_bindir}/true autoreconf -fi
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
@@ -509,6 +507,7 @@ exit 0
 * Thu Mar  1 2018 Matus Honek <mhonek(a)redhat.com&gt; - 2.4.45-13
 - fix: openldap does not use Fedora build flags
   + makes use of redhat-rpm-config package
+- Drop superfluous back-sql linking patch
 
 * Wed Feb 28 2018 Matus Honek <mhonek(a)redhat.com&gt; - 2.4.45-12
 - MozNSS Compat. Layer: fix: libldap tlsmc continues even after it fails to extract CA
certificates (#1550110)

commit cd7bdcf821f7ae4c1d97189129cdbbfdfe9d5210
Author: Matúš Honěk <mhonek(a)redhat.com&gt;
Date:   Mon Feb 26 13:20:36 2018 +0100

    fix: openldap does not use Fedora build flags
    
    - %configure introduces the correct flags, however we need* to set our
      custom CFLAGS before the actual run of ./configure, thus we request
      the flags explicitly using %set_build_flags
    - dropping %{optflags} which is just a legacy version of
      %{build_cflags} which is already included in $set_build_flags set
    
    * ./configure plays with the flags, hence customizing the CFLAGS after
      %configure does not have a desired effect
    
    Resolves: #1548676

diff --git a/openldap.spec b/openldap.spec
index 72dcf28..402f813 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -12,7 +12,7 @@
 
 Name: openldap
 Version: 2.4.45
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -161,15 +161,9 @@ popd
 
 %build
 
-%ifarch s390 s390x
-  export CFLAGS="-fPIE"
-%else
-  export CFLAGS="-fpie"
-%endif
-export LDFLAGS="-pie"
-# avoid stray dependencies (linker flag --as-needed)
+%set_build_flags
 # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
-export CFLAGS="${CFLAGS} %{optflags} -Wl,--as-needed,-z,relro,-z,now
-DLDAP_CONNECTIONLESS"
+export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
 
 pushd openldap-%{version}
 %configure \
@@ -512,6 +506,10 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar  1 2018 Matus Honek <mhonek(a)redhat.com&gt; - 2.4.45-13
+- fix: openldap does not use Fedora build flags
+  + makes use of redhat-rpm-config package
+
 * Wed Feb 28 2018 Matus Honek <mhonek(a)redhat.com&gt; - 2.4.45-12
 - MozNSS Compat. Layer: fix: libldap tlsmc continues even after it fails to extract CA
certificates (#1550110)