OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=22

avahi-mono.spec

@@ -11,11 +11,12 @@
 # norootforbuild
 
 Name:           avahi-mono
+%define         build_mono 1
 # WARNING: If you are editing avahi-mono.spec, STOP. Always edit
 # avahi.spec and then run pre_checkin.sh which will create
 # avahi-mono.spec based upon avahi.spec.
 Version:        0.6.20
-Release:        7
+Release:        8
 URL:            http://www.avahi.org/
 Group:          Development/Libraries/Other
 License:        LGPL v2 or later
@@ -30,7 +31,16 @@ Patch1:         avahi-desktop.patch
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel doxygen gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
-%define         build_mono 1
+%if %build_mono
+BuildRequires:  gtk-sharp2 mono-devel monodoc-core
+%else
+BuildRequires:  dbus-1-python python-devel python-gdbm qt3-devel
+%if %suse_version > 1010
+BuildRequires:  libqt4-devel python-gtk-devel
+%else
+BuildRequires:  python-gtk qt-devel
+%endif
+%endif
 
 %description
 Mono bindings for avahi.
@@ -56,15 +66,8 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %if %build_mono
-BuildRequires:  gtk-sharp2 mono-devel monodoc-core
 Requires:       avahi = %{version} gtk-sharp2
 %else
-BuildRequires:  dbus-1-python python-devel python-gdbm qt3-devel
-%if %suse_version > 1010
-BuildRequires:  libqt4-devel python-gtk-devel
-%else
-BuildRequires:  python-gtk qt-devel
-%endif
 Requires:       dbus-1 
 Requires:       nss-mdns
 Provides:       mDNSResponder = 107.5
@@ -127,7 +130,6 @@ Authors:
     Trent Lloyd <lathiat@freedesktop.org>
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
-
 %package -n avahi-qt3
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version}
@@ -254,7 +256,6 @@ Authors:
     Trent Lloyd <lathiat@freedesktop.org>
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
-
 %package -n avahi-compat-howl
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version}
@@ -313,7 +314,6 @@ Authors:
     Trent Lloyd <lathiat@freedesktop.org>
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
-
 %package -n avahi-devel
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version} dbus-1-devel glibc-devel glib2-devel gtk2-devel

avahi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 16 11:44:59 CEST 2007 - aj@suse.de
+
+- Fix spec file.
+
 -------------------------------------------------------------------
 Mon Jul 16 09:14:58 CEST 2007 - aj@suse.de
 

avahi.spec

@@ -11,11 +11,12 @@
 # norootforbuild
 
 Name:           avahi
+%define         build_mono 0
 # WARNING: If you are editing avahi-mono.spec, STOP. Always edit
 # avahi.spec and then run pre_checkin.sh which will create
 # avahi-mono.spec based upon avahi.spec.
 Version:        0.6.20
-Release:        7
+Release:        8
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        LGPL v2 or later
@@ -30,7 +31,16 @@ Patch1:         avahi-desktop.patch
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel doxygen gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
-%define         build_mono 0
+%if %build_mono
+BuildRequires:  gtk-sharp2 mono-devel monodoc-core
+%else
+BuildRequires:  dbus-1-python python-devel python-gdbm qt3-devel
+%if %suse_version > 1010
+BuildRequires:  libqt4-devel python-gtk-devel
+%else
+BuildRequires:  python-gtk qt-devel
+%endif
+%endif
 
 %description
 Avahi is an implementation of the DNS Service Discovery and Multicast
@@ -54,15 +64,8 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %if %build_mono
-BuildRequires:  gtk-sharp2 mono-devel monodoc-core
 Requires:       avahi = %{version} gtk-sharp2
 %else
-BuildRequires:  dbus-1-python python-devel python-gdbm qt3-devel
-%if %suse_version > 1010
-BuildRequires:  libqt4-devel python-gtk-devel
-%else
-BuildRequires:  python-gtk qt-devel
-%endif
 Requires:       dbus-1 
 Requires:       nss-mdns
 Provides:       mDNSResponder = 107.5
@@ -628,6 +631,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Jul 16 2007 - aj@suse.de
+- Fix spec file.
+* Mon Jul 16 2007 - aj@suse.de
 - Use extra spec file for avahi-mono to avoid build cycle
   avahi->gnome->mono->avahi.
 * Thu Jul 05 2007 - maw@suse.de