From dd016efad21e7257d43be3568ce25b0f7848c868e455ee62f348001e01bb943b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 10 May 2017 15:29:24 +0000 Subject: [PATCH] Accepting request 489978 from home:bmwiedemann:branches:GNOME:Factory use strip-nondeterminism to make build fully reproducible now with fixed suse_version to not get unresolvables on Leap and SLE12 OBS-URL: https://build.opensuse.org/request/show/489978 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=135 --- avahi-glib2.spec | 7 +++++++ avahi-mono.changes | 5 +++++ avahi-mono.spec | 6 ++++++ avahi-qt4.spec | 7 +++++++ avahi.spec | 7 +++++++ 5 files changed, 32 insertions(+) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index b00870f..f568489 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -102,6 +102,9 @@ BuildRequires: python-devel BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool +%if 0%{?suse_version} >= 1330 +BuildRequires: strip-nondeterminism +%endif %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -721,6 +724,7 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -948,6 +952,9 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/avahi %else %if %build_mono rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc +%if 0%{?suse_version} >= 1330 +strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip +%endif %endif %endif %endif diff --git a/avahi-mono.changes b/avahi-mono.changes index cce2ad4..2ae494b 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 21 13:49:59 UTC 2017 - bwiedemann@suse.com + +- use strip-nondeterminism to make build fully reproducible + ------------------------------------------------------------------- Sat Sep 17 13:52:32 UTC 2011 - jengelh@medozas.de diff --git a/avahi-mono.spec b/avahi-mono.spec index b940efb..901a00a 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -102,6 +102,9 @@ BuildRequires: python-devel BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool +%if 0%{?suse_version} >= 1330 +BuildRequires: strip-nondeterminism +%endif %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -948,6 +951,9 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/avahi %else %if %build_mono rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc +%if 0%{?suse_version} >= 1330 +strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip +%endif %endif %endif %endif diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 6fbf151..7206296 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -102,6 +102,9 @@ BuildRequires: python-devel BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool +%if 0%{?suse_version} >= 1330 +BuildRequires: strip-nondeterminism +%endif %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -723,6 +726,7 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -950,6 +954,9 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/avahi %else %if %build_mono rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc +%if 0%{?suse_version} >= 1330 +strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip +%endif %endif %endif %endif diff --git a/avahi.spec b/avahi.spec index 473186e..6c728f4 100644 --- a/avahi.spec +++ b/avahi.spec @@ -104,6 +104,9 @@ BuildRequires: python-devel BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool +%if 0%{?suse_version} >= 1330 +BuildRequires: strip-nondeterminism +%endif %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -723,6 +726,7 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -950,6 +954,9 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/avahi %else %if %build_mono rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc +%if 0%{?suse_version} >= 1330 +strip-nondeterminism $RPM_BUILD_ROOT%{_prefix}/lib/monodoc/sources/*.zip +%endif %endif %endif %endif