From b671db4411940a235b8e4bba347bb1191692b997eeb68538cd08907e793964b8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 1 Jul 2012 20:47:51 +0000 Subject: [PATCH 1/2] Accepting request 126829 from home:coolo:branches:openSUSE:Factory - fix build with automake 1.12.1, which removed AM_PROG_MKDIR_P, which is deprecated for a long time OBS-URL: https://build.opensuse.org/request/show/126829 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=82 --- avahi-fix-mkdir.diff | 26 ++++++++++++++++++++++++++ avahi-glib2.spec | 3 +++ avahi-mono.spec | 3 +++ avahi-qt4.spec | 3 +++ avahi.changes | 6 ++++++ avahi.spec | 3 +++ 6 files changed, 44 insertions(+) create mode 100644 avahi-fix-mkdir.diff diff --git a/avahi-fix-mkdir.diff b/avahi-fix-mkdir.diff new file mode 100644 index 0000000..bcfdb5b --- /dev/null +++ b/avahi-fix-mkdir.diff @@ -0,0 +1,26 @@ +Index: avahi-0.6.31/avahi-autoipd/Makefile.am +=================================================================== +--- avahi-0.6.31.orig/avahi-autoipd/Makefile.am 2010-08-26 02:51:38.000000000 +0200 ++++ avahi-0.6.31/avahi-autoipd/Makefile.am 2012-07-01 22:34:57.922855526 +0200 +@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh + dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d + + install-exec-hook: dhclient-exit-hook dhclient-enter-hook +- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) ++ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) + $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd + $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd + +Index: avahi-0.6.31/avahi-daemon/Makefile.am +=================================================================== +--- avahi-0.6.31.orig/avahi-daemon/Makefile.am 2010-08-26 02:51:38.000000000 +0200 ++++ avahi-0.6.31/avahi-daemon/Makefile.am 2012-07-01 22:34:44.570481086 +0200 +@@ -169,7 +169,7 @@ xmllint: + done + + install-data-local: +- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run" ++ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run" + + update-systemd: + curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c diff --git a/avahi-glib2.spec b/avahi-glib2.spec index fa00ccb..ee0d3ee 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -72,6 +72,8 @@ Patch10: avahi-unicastdomains.patch Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch +# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros +Patch13: avahi-fix-mkdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -720,6 +722,7 @@ translation-update-upstream %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi-mono.spec b/avahi-mono.spec index 6b1e6f0..7a9956b 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -72,6 +72,8 @@ Patch10: avahi-unicastdomains.patch Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch +# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros +Patch13: avahi-fix-mkdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -719,6 +721,7 @@ translation-update-upstream %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 4f7d48f..a6bfd7c 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -72,6 +72,8 @@ Patch10: avahi-unicastdomains.patch Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch +# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros +Patch13: avahi-fix-mkdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -722,6 +724,7 @@ translation-update-upstream %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi.changes b/avahi.changes index 5e380e8..58c4c01 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 1 20:38:09 UTC 2012 - coolo@suse.com + +- fix build with automake 1.12.1, which removed AM_PROG_MKDIR_P, + which is deprecated for a long time + ------------------------------------------------------------------- Mon Feb 27 13:34:33 UTC 2012 - vuntz@opensuse.org diff --git a/avahi.spec b/avahi.spec index a90598a..12149e2 100644 --- a/avahi.spec +++ b/avahi.spec @@ -74,6 +74,8 @@ Patch10: avahi-unicastdomains.patch Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch +# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros +Patch13: avahi-fix-mkdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -722,6 +724,7 @@ translation-update-upstream %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. From 571f04129d93345648d669267fcfc02dc6c16ecc76056f45c167c73d3879ff38 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 1 Jul 2012 20:52:24 +0000 Subject: [PATCH 2/2] Accepting request 126830 from home:dimstar:branches:GNOME:Factory - Add avahi-fix-mkdir.diff: fix build with automake 1.12.1, which removed AM_PROG_MKDIR_P, which is deprecated for a long time. OBS-URL: https://build.opensuse.org/request/show/126830 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=83 --- avahi.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avahi.changes b/avahi.changes index 58c4c01..2f7bcc8 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Sun Jul 1 20:38:09 UTC 2012 - coolo@suse.com -- fix build with automake 1.12.1, which removed AM_PROG_MKDIR_P, - which is deprecated for a long time +- Add avahi-fix-mkdir.diff: fix build with automake 1.12.1, which + removed AM_PROG_MKDIR_P, which is deprecated for a long time. ------------------------------------------------------------------- Mon Feb 27 13:34:33 UTC 2012 - vuntz@opensuse.org