From b879c0a639b2bcc67e5dc7ef7638eac580be5371997b0bc03d9b862652f15984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 8 Jan 2020 18:58:21 +0000 Subject: [PATCH] Accepting request 761804 from home:marxin:branches:GNOME:Factory - Use %make_build. OBS-URL: https://build.opensuse.org/request/show/761804 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=161 --- avahi-glib2.changes | 5 +++++ avahi-glib2.spec | 11 ++++++----- avahi-mono.changes | 5 +++++ avahi-mono.spec | 11 ++++++----- avahi.changes | 5 +++++ avahi.spec | 10 +++++----- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index 83d991a..0015f61 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 8 10:17:38 UTC 2020 - Martin Liška + +- Use %make_build. + ------------------------------------------------------------------- Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 6bfe9b8..b0fddaf 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -506,16 +506,16 @@ export PYTHON=%{_bindir}/python3 %if %{build_glib2} && !%{build_core} for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -make %{?_smp_mflags} +%make_build cd .. done %endif %if %{build_mono} && !%{build_core} cd avahi-sharp -make %{?_smp_mflags} +%make_build cd ../avahi-ui-sharp %endif -make %{?_smp_mflags} +%make_build %install %if %{build_glib2} && !%{build_core} @@ -536,7 +536,8 @@ cd ../avahi-ui-sharp rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%{build_core} cd .. -make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=%{buildroot} +%make_build install-pkgconfigDATA DESTDIR=%{buildroot} + %endif %if %{build_core} # do not remove this unless you plan to fix _all_ the references to diff --git a/avahi-mono.changes b/avahi-mono.changes index 362cc78..249e336 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 8 10:17:46 UTC 2020 - Martin Liška + +- Use %make_build. + ------------------------------------------------------------------- Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie diff --git a/avahi-mono.spec b/avahi-mono.spec index d55baa9..8d0de19 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -506,16 +506,17 @@ export PYTHON=%{_bindir}/python3 %if %{build_glib2} && !%{build_core} for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -make %{?_smp_mflags} +%make_build + cd .. done %endif %if %{build_mono} && !%{build_core} cd avahi-sharp -make %{?_smp_mflags} +%make_build cd ../avahi-ui-sharp %endif -make %{?_smp_mflags} +%make_build %install %if %{build_glib2} && !%{build_core} @@ -536,7 +537,7 @@ cd ../avahi-ui-sharp rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%{build_core} cd .. -make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=%{buildroot} +%make_build install-pkgconfigDATA DESTDIR=%{buildroot} %endif %if %{build_core} # do not remove this unless you plan to fix _all_ the references to diff --git a/avahi.changes b/avahi.changes index 69d899f..3d9aab9 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 8 10:17:28 UTC 2020 - Martin Liška + +- Use %make_build. + ------------------------------------------------------------------- Thu Aug 22 20:40:18 UTC 2019 - Jan Engelhardt diff --git a/avahi.spec b/avahi.spec index 40f887c..92d2f87 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -501,16 +501,16 @@ export PYTHON=%{_bindir}/python3 %if %{build_glib2} && !%{build_core} for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -make %{?_smp_mflags} +%make_build cd .. done %endif %if %{build_mono} && !%{build_core} cd avahi-sharp -make %{?_smp_mflags} +%make_build cd ../avahi-ui-sharp %endif -make %{?_smp_mflags} +%make_build %install %if %{build_glib2} && !%{build_core} @@ -531,7 +531,7 @@ cd ../avahi-ui-sharp rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%{build_core} cd .. -make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=%{buildroot} +%make_build install-pkgconfigDATA DESTDIR=%{buildroot} %endif %if %{build_core} # do not remove this unless you plan to fix _all_ the references to