Accepting request 107304 from GNOME:Factory

Improve systemd-related packaging (forwarded request 107169 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/107304
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=91
This commit is contained in:
Stephan Kulow 2012-03-01 06:24:52 +00:00 committed by Git OBS Bridge
commit 2236d9869a
5 changed files with 188 additions and 76 deletions

View File

@ -106,7 +106,7 @@ BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: systemd
BuildRequires: systemd-devel
%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
@ -125,17 +125,17 @@ Obsoletes: mDNSResponder < 107.5
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libavahi-devel
BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
BuildRequires: qt3-devel
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %build_qt4
BuildRequires: libqt4-devel
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
%endif
%if %build_mono
BuildRequires: gtk-sharp2
@ -143,7 +143,11 @@ BuildRequires: libavahi-glib-devel
BuildRequires: mono-devel
BuildRequires: monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%endif
%description
@ -275,7 +279,11 @@ correct mDNS reflection across LAN segments.
Summary: A set of Avahi utilities written in Python
Group: Development/Languages/Python
PreReq: coreutils
Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web
Requires: %{name} = %{version}
Requires: dbus-1-python
Requires: python-gdbm
Requires: python-twisted
Requires: python-twisted-web
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -316,7 +324,12 @@ across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
#
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
Requires: libavahi-client3 = %{version}
Requires: libavahi-common3 = %{version}
Requires: libavahi-core7 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
@ -337,7 +350,8 @@ correct mDNS reflection across LAN segments.
%package compat-mDNSResponder-devel
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Requires: libavahi-devel = %{version}
Requires: libdns_sd = %{version}
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
@ -359,7 +373,8 @@ correct mDNS reflection across LAN segments.
%package compat-howl-devel
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Requires: libavahi-devel = %{version}
Requires: libhowl0 = %{version}
%description compat-howl-devel
Howl compatibility layer for avahi.
@ -498,7 +513,8 @@ across LAN segments.
Summary: A set of Avahi utilities written in Python Using python-gtk
Group: Development/Languages/Python
PreReq: coreutils
Requires: python-avahi = %{version} python-gtk
Requires: python-avahi = %{version}
Requires: python-gtk
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -524,8 +540,8 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui0 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@ -548,7 +564,10 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-gobject-devel
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Daemons
Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
Requires: glib2-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-glib-devel
Requires: libavahi-gobject0 = %{version}
%description -n libavahi-gobject-devel
Avahi is an implementation of the DNS Service Discovery and Multicast
@ -593,7 +612,9 @@ correct mDNS reflection across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
@ -640,7 +661,9 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt4-1 = %{version}
Requires: libqt4-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt4.so
@ -666,7 +689,11 @@ correct mDNS reflection across LAN segments.
%package -n avahi-mono
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: Development/Languages/Mono
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%description -n avahi-mono
This package provides Mono bindings for avahi. Avahi is an
@ -717,7 +744,6 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@ -1024,9 +1050,9 @@ fi
%{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
%{_unitdir}/avahi-daemon.service
%{_unitdir}/avahi-daemon.socket
%{_unitdir}/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces

View File

@ -106,7 +106,7 @@ BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: systemd
BuildRequires: systemd-devel
%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
@ -125,17 +125,17 @@ Obsoletes: mDNSResponder < 107.5
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libavahi-devel
BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
BuildRequires: qt3-devel
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %build_qt4
BuildRequires: libqt4-devel
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
%endif
%if %build_mono
BuildRequires: gtk-sharp2
@ -143,7 +143,11 @@ BuildRequires: libavahi-glib-devel
BuildRequires: mono-devel
BuildRequires: monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%endif
%description
@ -274,7 +278,11 @@ correct mDNS reflection across LAN segments.
Summary: A set of Avahi utilities written in Python
Group: Development/Languages/Python
PreReq: coreutils
Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web
Requires: %{name} = %{version}
Requires: dbus-1-python
Requires: python-gdbm
Requires: python-twisted
Requires: python-twisted-web
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -315,7 +323,12 @@ across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
#
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
Requires: libavahi-client3 = %{version}
Requires: libavahi-common3 = %{version}
Requires: libavahi-core7 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
@ -336,7 +349,8 @@ correct mDNS reflection across LAN segments.
%package compat-mDNSResponder-devel
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Requires: libavahi-devel = %{version}
Requires: libdns_sd = %{version}
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
@ -358,7 +372,8 @@ correct mDNS reflection across LAN segments.
%package compat-howl-devel
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Requires: libavahi-devel = %{version}
Requires: libhowl0 = %{version}
%description compat-howl-devel
Howl compatibility layer for avahi.
@ -497,7 +512,8 @@ across LAN segments.
Summary: A set of Avahi utilities written in Python Using python-gtk
Group: Development/Languages/Python
PreReq: coreutils
Requires: python-avahi = %{version} python-gtk
Requires: python-avahi = %{version}
Requires: python-gtk
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -523,8 +539,8 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui0 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@ -547,7 +563,10 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-gobject-devel
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Daemons
Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
Requires: glib2-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-glib-devel
Requires: libavahi-gobject0 = %{version}
%description -n libavahi-gobject-devel
Avahi is an implementation of the DNS Service Discovery and Multicast
@ -592,7 +611,9 @@ correct mDNS reflection across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
@ -639,7 +660,9 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt4-1 = %{version}
Requires: libqt4-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt4.so
@ -665,7 +688,11 @@ correct mDNS reflection across LAN segments.
%package -n avahi-mono
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: Development/Languages/Mono
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%description -n avahi-mono
This package provides Mono bindings for avahi. Avahi is an
@ -716,7 +743,6 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@ -1023,9 +1049,9 @@ fi
%{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
%{_unitdir}/avahi-daemon.service
%{_unitdir}/avahi-daemon.socket
%{_unitdir}/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces

View File

@ -106,7 +106,7 @@ BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: systemd
BuildRequires: systemd-devel
%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
@ -125,17 +125,17 @@ Obsoletes: mDNSResponder < 107.5
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libavahi-devel
BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
BuildRequires: qt3-devel
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %build_qt4
BuildRequires: libqt4-devel
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
%endif
%if %build_mono
BuildRequires: gtk-sharp2
@ -143,7 +143,11 @@ BuildRequires: libavahi-glib-devel
BuildRequires: mono-devel
BuildRequires: monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%endif
%description
@ -277,7 +281,11 @@ correct mDNS reflection across LAN segments.
Summary: A set of Avahi utilities written in Python
Group: Development/Languages/Python
PreReq: coreutils
Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web
Requires: %{name} = %{version}
Requires: dbus-1-python
Requires: python-gdbm
Requires: python-twisted
Requires: python-twisted-web
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -318,7 +326,12 @@ across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
#
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
Requires: libavahi-client3 = %{version}
Requires: libavahi-common3 = %{version}
Requires: libavahi-core7 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
@ -339,7 +352,8 @@ correct mDNS reflection across LAN segments.
%package compat-mDNSResponder-devel
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Requires: libavahi-devel = %{version}
Requires: libdns_sd = %{version}
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
@ -361,7 +375,8 @@ correct mDNS reflection across LAN segments.
%package compat-howl-devel
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Requires: libavahi-devel = %{version}
Requires: libhowl0 = %{version}
%description compat-howl-devel
Howl compatibility layer for avahi.
@ -500,7 +515,8 @@ across LAN segments.
Summary: A set of Avahi utilities written in Python Using python-gtk
Group: Development/Languages/Python
PreReq: coreutils
Requires: python-avahi = %{version} python-gtk
Requires: python-avahi = %{version}
Requires: python-gtk
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -526,8 +542,8 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui0 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@ -550,7 +566,10 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-gobject-devel
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Daemons
Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
Requires: glib2-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-glib-devel
Requires: libavahi-gobject0 = %{version}
%description -n libavahi-gobject-devel
Avahi is an implementation of the DNS Service Discovery and Multicast
@ -595,7 +614,9 @@ correct mDNS reflection across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
@ -642,7 +663,9 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt4-1 = %{version}
Requires: libqt4-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt4.so
@ -668,7 +691,11 @@ correct mDNS reflection across LAN segments.
%package -n avahi-mono
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: Development/Languages/Mono
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%description -n avahi-mono
This package provides Mono bindings for avahi. Avahi is an
@ -719,7 +746,6 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@ -1026,9 +1052,9 @@ fi
%{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
%{_unitdir}/avahi-daemon.service
%{_unitdir}/avahi-daemon.socket
%{_unitdir}/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 27 13:34:33 UTC 2012 - vuntz@opensuse.org
- Stop passing --with-systemdsystemunitdir to configure: we'll just
use the right default value, which should be %{_unitdir}.
- Change systemd BuildRequires to systemd-devel since this is
needed to get that default value in configure.
-------------------------------------------------------------------
Wed Feb 15 09:15:34 UTC 2012 - vuntz@opensuse.org

View File

@ -108,7 +108,7 @@ BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: systemd
BuildRequires: systemd-devel
%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
@ -127,17 +127,17 @@ Obsoletes: mDNSResponder < 107.5
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libavahi-devel
BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
BuildRequires: qt3-devel
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %build_qt4
BuildRequires: libqt4-devel
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
%endif
%if %build_mono
BuildRequires: gtk-sharp2
@ -145,7 +145,11 @@ BuildRequires: libavahi-glib-devel
BuildRequires: mono-devel
BuildRequires: monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%endif
%description
@ -277,7 +281,11 @@ correct mDNS reflection across LAN segments.
Summary: A set of Avahi utilities written in Python
Group: Development/Languages/Python
PreReq: coreutils
Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web
Requires: %{name} = %{version}
Requires: dbus-1-python
Requires: python-gdbm
Requires: python-twisted
Requires: python-twisted-web
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -318,7 +326,12 @@ across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
#
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
Requires: libavahi-client3 = %{version}
Requires: libavahi-common3 = %{version}
Requires: libavahi-core7 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
@ -339,7 +352,8 @@ correct mDNS reflection across LAN segments.
%package compat-mDNSResponder-devel
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Requires: libavahi-devel = %{version}
Requires: libdns_sd = %{version}
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
@ -361,7 +375,8 @@ correct mDNS reflection across LAN segments.
%package compat-howl-devel
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Requires: libavahi-devel = %{version}
Requires: libhowl0 = %{version}
%description compat-howl-devel
Howl compatibility layer for avahi.
@ -500,7 +515,8 @@ across LAN segments.
Summary: A set of Avahi utilities written in Python Using python-gtk
Group: Development/Languages/Python
PreReq: coreutils
Requires: python-avahi = %{version} python-gtk
Requires: python-avahi = %{version}
Requires: python-gtk
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
@ -526,8 +542,8 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui0 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@ -550,7 +566,10 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-gobject-devel
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Daemons
Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
Requires: glib2-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-glib-devel
Requires: libavahi-gobject0 = %{version}
%description -n libavahi-gobject-devel
Avahi is an implementation of the DNS Service Discovery and Multicast
@ -595,7 +614,9 @@ correct mDNS reflection across LAN segments.
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
@ -642,7 +663,9 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel
Requires: libavahi-devel = %{version}
Requires: libavahi-qt4-1 = %{version}
Requires: libqt4-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt4.so
@ -668,7 +691,11 @@ correct mDNS reflection across LAN segments.
%package -n avahi-mono
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: Development/Languages/Mono
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version}
Requires: libavahi-common3 >= %{version}
Requires: libavahi-glib1 >= %{version}
Requires: libavahi-ui0 >= %{version}
%description -n avahi-mono
This package provides Mono bindings for avahi. Avahi is an
@ -719,7 +746,6 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@ -1026,9 +1052,9 @@ fi
%{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
%{_unitdir}/avahi-daemon.service
%{_unitdir}/avahi-daemon.socket
%{_unitdir}/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces