From 4acd8adcdaf6f8efb5643af0086fcc0af5a1d296 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 5 Oct 2018 09:49:27 +0200
Subject: [PATCH] Fix multilib -devel installs

This time the issue was that the glib build system generates
bytecompiled python files during make install, so the 'touch -r' that's
after make install didn't take effect. Fix this by removing the
bytecompiled files after make install, and let rpmbuild brp scripts
regenerate them again afterwards.

https://bugzilla.redhat.com/show_bug.cgi?id=1634778
---
 glib2.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/glib2.spec b/glib2.spec
index 58b6f20..31ee834 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -5,7 +5,7 @@
 
 Name: glib2
 Version: 2.58.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library of handy utility functions
 
 License: LGPLv2+
@@ -104,13 +104,16 @@ rm glib/pcre/*.[ch]
 # otherwise it will vary by build time, and thus break multilib -devel
 # installs.
 touch -r gio/gdbus-2.0/codegen/config.py.in $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/codegen/config.py
-touch -r gio/gdbus-2.0/codegen/config.py.in $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/codegen/codegen_main.py
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
+# Remove python files bytecompiled by the build system. rpmbuild regenerates
+# them again later in a brp script using the timestamps set above.
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
+rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/__pycache__/
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/codegen/*.{pyc,pyo}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glib-2.0/codegen/__pycache__/
 
 mv  $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-%{__isa_bits}
 
@@ -218,6 +221,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Fri Oct 05 2018 Kalev Lember <klember@redhat.com> - 2.58.1-2
+- Fix multilib -devel installs (#1634778)
+
 * Fri Sep 21 2018 Kalev Lember <klember@redhat.com> - 2.58.1-1
 - Update to 2.58.1
 
@@ -241,7 +247,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
   notification backend (RH #1584916)
 
 * Sun May 27 2018 Kalev Lember <klember@redhat.com> - 2.56.1-3
-- Fix multilib -devel installs (RH #1581067)
+- Fix multilib -devel installs (#1581067)
 
 * Sun May 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.56.1-2
 - Include upstream patch to fix gdbus-codegen with meson 0.46.