diff --git a/SPECS/compat-locales-sap.spec b/SPECS/compat-locales-sap.spec
index f20ce63..66d62b8 100644
--- a/SPECS/compat-locales-sap.spec
+++ b/SPECS/compat-locales-sap.spec
@@ -1,6 +1,7 @@
+%define debug_package %{nil}
 Name:           compat-locales-sap
 Version:        1.0.10
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        Compatibility locales for SAP
 
 Group:          System Environment/Libraries
@@ -19,7 +20,7 @@ Source17:       glibc-2.26-tr_TR
 Source18:       glibc-2.26-cs_CZ
 Source19:       glibc-2.26-sk_SK
 Obsoletes:      %{name}-common
-BuildArch:      noarch
+Conflicts:      %{name} <= 1.0.10-6
 BuildRequires:  glibc-locale-source
 Patch0:         saplocales-2.2.5-rhel5.patch
 Patch1:         glibc-cs_CZ@SAP.patch
@@ -202,56 +203,6 @@ localedef --no-archive -ci $RPM_BUILD_ROOT%{_datadir}/i18n/locales/pl_PL@HPUX \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%posttrans
-# mv or ln instead of cp makes firefox crash:
-cp %{_prefix}/lib/locale/locale-archive %{_prefix}/lib/locale/locale-archive.tmpl
-%{_prefix}/sbin/build-locale-archive
-exit 0
-
-%postun
-if [ $1 = 0 ] ; then
-  for i in \
-       tr_TR@SAP \
-       tr_TR.iso88599@SAP \
-       ko_KR@SAP \
-       ko_KR.euckr@SAP \
-       lt_LT@SAP \
-       lt_LT.iso88594@SAP \
-       lv_LV@SAP \
-       lv_LV.iso88594@SAP \
-       et_EE@SAP \
-       et_EE.iso88594@SAP \
-       cs_CZ@SAP \
-       cs_CZ.iso88592@SAP \
-       cs_CZ@HPUX \
-       cs_CZ.iso88592@HPUX \
-       sk_SK@SAP \
-       sk_SK.iso88592@SAP \
-       de_DE@POSIX \
-       de_DE.iso88591@POSIX \
-       en_US@POSIX \
-       en_US.iso88591@POSIX \
-       de_DE@WINDOWS \
-       de_DE.cp1252@WINDOWS \
-       en_US@WINDOWS \
-       en_US.cp1252@WINDOWS \
-       es_ES@SAP \
-       es_ES.iso88591@SAP \
-       en_US@Solaris \
-       en_US.iso88591@Solaris \
-       de_DE@Solaris \
-       de_DE.iso88591@Solaris \
-       en_US@HPUX \
-       en_US.iso88591@HPUX \
-       de_DE@HPUX \
-       de_DE.iso88591@HPUX \
-       pl_PL@HPUX \
-       pl_PL.iso88592@HPUX \
-       ;
-    do localedef --delete-from-archive $i
-  done
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc saplocales-2.2.5/COPYING.LIB
@@ -261,6 +212,27 @@ fi
 %{_prefix}/lib/locale/*
 
 %changelog
+* Tue Apr 23 2019 Mike Fabian <mfabian@redhat.com> - 1.0.10-9
+- Add Conflicts: compat-locales-sap <= 1.0.10-6 to avoid
+  rpmdeplint error because of the architecture change.
+- Related: rhbz#1688815
+
+* Wed Apr 17 2019 Mike Fabian <mfabian@redhat.com> - 1.0.10-8
+- Remove  BuildArch: noarch. The binary locales are architecture
+  dependent.
+- Related: rhbz#1688815
+
+* Fri Apr 12 2019 Mike Fabian <mfabian@redhat.com> - 1.0.10-7
+- Remove "Requires: glibc-all-langpacks" again and drop the
+  posttrans and postun scripts instead. If these scripts are removed,
+  glibc-all-langpacks is not needed anymore.
+  This avoids problems with /usr/sbin/build-locale-archive.
+- Related: rhbz#1688815
+
+* Wed Apr 10 2019 Mike Fabian <mfabian@redhat.com> - 1.0.10-6
+- Add "Requires: glibc-all-langpacks"
+- Resolves: rhbz#1688815 (rhel-8.0.1)
+
 * Tue Oct 16 2018 Mike Fabian <mfabian@redhat.com> - 1.0.10-5
 - Bump release number
 - Resolves: rhbz#1639296