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
This commit is contained in:
Dominique Leuenberger 2012-07-01 20:47:51 +00:00 committed by Git OBS Bridge
parent 125b998cb6
commit b671db4411
6 changed files with 44 additions and 0 deletions

26
avahi-fix-mkdir.diff Normal file
View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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.