From dea8a050ccfc2eeece476b52000469627ae8b6f7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: May 27 2018 12:16:21 +0000 Subject: Fix multilib -devel installs (#1581067) We are patching one of the .py files, which is causing the timestamp to be slightly off in different builds, which in turn gets baked into .pyc files. Work this around by using another file's timestamp for the patched .py file. --- diff --git a/glib2.spec b/glib2.spec index e0ee2b9..81fa961 100644 --- a/glib2.spec +++ b/glib2.spec @@ -5,7 +5,7 @@ Name: glib2 Version: 2.56.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library of handy utility functions License: LGPLv2+ @@ -110,6 +110,7 @@ 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 @@ -221,6 +222,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Sun May 27 2018 Kalev Lember - 2.56.1-3 +- Fix multilib -devel installs (#1581067) + * Sun May 13 2018 Fabio Valentini - 2.56.1-2 - Include upstream patch to fix gdbus-codegen with meson 0.46.