From 05ab6a6368a7aa869fb9e192bb25313087e2db7326491254f00a5d1b9b2b426e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 1 Aug 2008 23:23:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=41 --- avahi-glib2.changes | 10 ++++++++++ avahi-glib2.spec | 15 ++++++++++----- avahi-mono.spec | 11 ++++++----- avahi-qt4.spec | 11 ++++++----- avahi.spec | 11 ++++++----- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index 5734b2f..f8ca36d 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Aug 1 17:19:48 CEST 2008 - ro@suse.de + +- fix requires for debuginfo package + +------------------------------------------------------------------- +Sat Jul 26 13:18:59 CEST 2008 - aj@suse.de + +- Fix requires to require avahi base package. + ------------------------------------------------------------------- Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 6e90ae4..5cad9ec 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -24,7 +24,7 @@ Name: avahi-glib2 %define build_qt3 0 %define build_qt4 0 Version: 0.6.23 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -70,7 +70,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{name}-lang = %{version} +Requires: %{_name}-lang = %{version} BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -307,7 +307,7 @@ Authors: %package utils License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils @@ -335,7 +335,7 @@ Authors: License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development # -Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} @@ -424,6 +424,7 @@ Authors: %endif %if %build_glib2 +%define debug_package_requires libavahi-ui0 = %{version} %package -n libavahi-ui0 License: LGPL v2.1 or later @@ -511,7 +512,7 @@ Authors: %package utils-gtk License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: System/Daemons %description utils-gtk @@ -1277,6 +1278,10 @@ fi %endif %changelog +* Fri Aug 01 2008 ro@suse.de +- fix requires for debuginfo package +* Sat Jul 26 2008 aj@suse.de +- Fix requires to require avahi base package. * Fri Jul 18 2008 sbrabec@suse.cz - Build glib2, gobject and python stuff separately to break build loop cups -> gtk2 -> avahi -> cups. diff --git a/avahi-mono.spec b/avahi-mono.spec index 8bb19c3..fa00bfd 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -24,7 +24,7 @@ Name: avahi-mono %define build_qt3 0 %define build_qt4 0 Version: 0.6.23 -Release: 1 +Release: 16 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -70,7 +70,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{name}-lang = %{version} +Requires: %{_name}-lang = %{version} BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -306,7 +306,7 @@ Authors: %package utils License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils @@ -334,7 +334,7 @@ Authors: License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development # -Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} @@ -423,6 +423,7 @@ Authors: %endif %if %build_glib2 +%define debug_package_requires libavahi-ui0 = %{version} %package -n libavahi-ui0 License: LGPL v2.1 or later @@ -510,7 +511,7 @@ Authors: %package utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils-gtk diff --git a/avahi-qt4.spec b/avahi-qt4.spec index a931ea6..0320dd9 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -24,7 +24,7 @@ Name: avahi-qt4 %define build_qt3 0 %define build_qt4 1 Version: 0.6.23 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -70,7 +70,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{name}-lang = %{version} +Requires: %{_name}-lang = %{version} BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -309,7 +309,7 @@ Authors: %package utils License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils @@ -337,7 +337,7 @@ Authors: License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development # -Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} @@ -426,6 +426,7 @@ Authors: %endif %if %build_glib2 +%define debug_package_requires libavahi-ui0 = %{version} %package -n libavahi-ui0 License: LGPL v2.1 or later @@ -513,7 +514,7 @@ Authors: %package utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils-gtk diff --git a/avahi.spec b/avahi.spec index ddd48d5..837bc01 100644 --- a/avahi.spec +++ b/avahi.spec @@ -26,7 +26,7 @@ Name: avahi %define build_qt3 0 %define build_qt4 0 Version: 0.6.23 -Release: 1 +Release: 11 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -72,7 +72,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{name}-lang = %{version} +Requires: %{_name}-lang = %{version} BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -309,7 +309,7 @@ Authors: %package utils License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils @@ -337,7 +337,7 @@ Authors: License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development # -Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} @@ -426,6 +426,7 @@ Authors: %endif %if %build_glib2 +%define debug_package_requires libavahi-ui0 = %{version} %package -n libavahi-ui0 License: LGPL v2.1 or later @@ -513,7 +514,7 @@ Authors: %package utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{name} >= %{version} +Requires: %{_name} >= %{version} Group: Productivity/Networking/Other %description utils-gtk