From 789d0acce00b6332bdc9fc2f97b9e0b1e7311b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Mar 2019 13:33:00 +0100 Subject: [PATCH] Make sure all .py files have fixed timestamps --- glib2.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/glib2.spec b/glib2.spec index 9ca7f74..fb8ddda 100644 --- a/glib2.spec +++ b/glib2.spec @@ -9,7 +9,7 @@ Name: glib2 Version: 2.60.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library of handy utility functions License: LGPLv2+ @@ -109,7 +109,9 @@ rm glib/pcre/*.[ch] # Since this is a generated .py file, set it to a known timestamp, # 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 +# Also copy the timestamp for other .py files, because meson doesn't do +# this, see https://github.com/mesonbuild/meson/issues/5027. +touch -r gio/gdbus-2.0/codegen/config.py.in $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/codegen/*.py chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-%{__isa_bits} @@ -218,6 +220,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Wed Mar 6 2019 Zbigniew Jędrzejewski-Szmek - 2.60.0-2 +- Make sure all .py files have fixed timestamps (fixes issue with + parallel installability of i686 and amd64 -devel packages) + * Mon Mar 04 2019 Kalev Lember - 2.60.0-1 - Update to 2.60.0