From cbabe2c95a8d83285cb056758bb9f56c3e9de7562b1a036c4cdf275597249fcf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 8 Mar 2016 23:17:27 +0000 Subject: [PATCH] Accepting request 368811 from GNOME:Factory Revert last change - incomplete and the wrong entry point OBS-URL: https://build.opensuse.org/request/show/368811 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=124 --- avahi-glib2.spec | 3 --- avahi-mono.spec | 3 --- avahi-qt4.spec | 3 --- avahi.changes | 6 ------ avahi.spec | 3 --- 5 files changed, 18 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 42a4fb2..ddcf13a 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -97,9 +97,6 @@ Patch17: avahi-outdated-URL.patch Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python -# dbus-1-python requires python-gobject, which in turn requires typelib(GdkX11) (provided by typelib-1_0-Gtk-3_0). -# This causes a build cycle with gtk3 though, so we ignore this dependency -#!BuildIgnore: typelib(GdkX11) BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdbm-devel diff --git a/avahi-mono.spec b/avahi-mono.spec index b8de1f1..fbeef19 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -97,9 +97,6 @@ Patch17: avahi-outdated-URL.patch Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python -# dbus-1-python requires python-gobject, which in turn requires typelib(GdkX11) (provided by typelib-1_0-Gtk-3_0). -# This causes a build cycle with gtk3 though, so we ignore this dependency -#!BuildIgnore: typelib(GdkX11) BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdbm-devel diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 5bb0b1c..c5ad972 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -97,9 +97,6 @@ Patch17: avahi-outdated-URL.patch Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python -# dbus-1-python requires python-gobject, which in turn requires typelib(GdkX11) (provided by typelib-1_0-Gtk-3_0). -# This causes a build cycle with gtk3 though, so we ignore this dependency -#!BuildIgnore: typelib(GdkX11) BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdbm-devel diff --git a/avahi.changes b/avahi.changes index 742863b..51792aa 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 8 22:41:28 UTC 2016 - dimstar@opensuse.org - -- BuildIgnore typelib(GdkX11) as required by python-gobject: this - causes a build cycle with gtk3. - ------------------------------------------------------------------- Mon Jan 25 13:58:10 UTC 2016 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 3bbeeaf..57024ed 100644 --- a/avahi.spec +++ b/avahi.spec @@ -99,9 +99,6 @@ Patch17: avahi-outdated-URL.patch Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python -# dbus-1-python requires python-gobject, which in turn requires typelib(GdkX11) (provided by typelib-1_0-Gtk-3_0). -# This causes a build cycle with gtk3 though, so we ignore this dependency -#!BuildIgnore: typelib(GdkX11) BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdbm-devel