Accepting request 87628 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/87628
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=87
This commit is contained in:
Lars Vogdt 2011-10-13 10:17:22 +00:00 committed by Git OBS Bridge
commit 6f3de7c600
5 changed files with 69 additions and 44 deletions

View File

@ -85,9 +85,13 @@ PreReq: sysvinit(network)
%else %else
PreReq: sysconfig PreReq: sysconfig
%endif %endif
%{?systemd_requires}
Recommends: %{_name}-lang Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
BuildRequires: libtool BuildRequires: libtool
%if %suse_version >= 1210
BuildRequires: systemd
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -863,21 +867,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-daemon.service avahi-dnsconfd.service
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f -y avahi-daemon}
%{fillup_and_insserv -f avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%if %suse_version >= 1210
%service_add_post avahi-daemon.service avahi-dnsconfd.service
%endif
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}
%{stop_on_removal avahi-dnsconfd} %{stop_on_removal avahi-dnsconfd}
%if %suse_version >= 1210
%service_del_preun avahi-daemon.service avahi-dnsconfd.service
%endif
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%{restart_on_update avahi-daemon} %{restart_on_update avahi-daemon}
%{restart_on_update avahi-dnsconfd} %{restart_on_update avahi-dnsconfd}
%insserv_cleanup %insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-daemon.service avahi-dnsconfd.service
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig

View File

@ -85,9 +85,13 @@ PreReq: sysvinit(network)
%else %else
PreReq: sysconfig PreReq: sysconfig
%endif %endif
%{?systemd_requires}
Recommends: %{_name}-lang Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
BuildRequires: libtool BuildRequires: libtool
%if %suse_version >= 1210
BuildRequires: systemd
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -142,28 +146,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments. things, like correct mDNS reflection across LAN segments.
This package provides Mono bindings for avahi. Avahi is an
implementation of the DNS Service Discovery and MulticastDNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks. The Avahi mDNS responder is
now feature complete, implementing all MUSTs and the majority of the
SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments.
This package provides Mono bindings for avahi. Avahi is an
implementation of the DNS Service Discovery and MulticastDNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks. The Avahi mDNS responder is
now feature complete, implementing all MUSTs and the majority of the
SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments.
%if %build_core %if %build_core
%package -n libavahi-client3 %package -n libavahi-client3
@ -708,28 +690,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments. things, like correct mDNS reflection across LAN segments.
This package provides Mono bindings for avahi. Avahi is an
implementation of the DNS Service Discovery and MulticastDNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks. The Avahi mDNS responder is
now feature complete, implementing all MUSTs and the majority of the
SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments.
This package provides Mono bindings for avahi. Avahi is an
implementation of the DNS Service Discovery and MulticastDNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks. The Avahi mDNS responder is
now feature complete, implementing all MUSTs and the majority of the
SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
Bonjour conformance test suite. In addition, it supports some nifty
things, like correct mDNS reflection across LAN segments.
%endif %endif
%lang_package %lang_package
%endif %endif
@ -928,21 +888,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-daemon.service avahi-dnsconfd.service
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f -y avahi-daemon}
%{fillup_and_insserv -f avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%if %suse_version >= 1210
%service_add_post avahi-daemon.service avahi-dnsconfd.service
%endif
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}
%{stop_on_removal avahi-dnsconfd} %{stop_on_removal avahi-dnsconfd}
%if %suse_version >= 1210
%service_del_preun avahi-daemon.service avahi-dnsconfd.service
%endif
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%{restart_on_update avahi-daemon} %{restart_on_update avahi-daemon}
%{restart_on_update avahi-dnsconfd} %{restart_on_update avahi-dnsconfd}
%insserv_cleanup %insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-daemon.service avahi-dnsconfd.service
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig

View File

@ -85,9 +85,13 @@ PreReq: sysvinit(network)
%else %else
PreReq: sysconfig PreReq: sysconfig
%endif %endif
%{?systemd_requires}
Recommends: %{_name}-lang Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
BuildRequires: libtool BuildRequires: libtool
%if %suse_version >= 1210
BuildRequires: systemd
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -865,21 +869,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-daemon.service avahi-dnsconfd.service
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f -y avahi-daemon}
%{fillup_and_insserv -f avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%if %suse_version >= 1210
%service_add_post avahi-daemon.service avahi-dnsconfd.service
%endif
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}
%{stop_on_removal avahi-dnsconfd} %{stop_on_removal avahi-dnsconfd}
%if %suse_version >= 1210
%service_del_preun avahi-daemon.service avahi-dnsconfd.service
%endif
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%{restart_on_update avahi-daemon} %{restart_on_update avahi-daemon}
%{restart_on_update avahi-dnsconfd} %{restart_on_update avahi-dnsconfd}
%insserv_cleanup %insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-daemon.service avahi-dnsconfd.service
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 10 08:44:41 UTC 2011 - fcrozat@suse.com
- Use systemd macros for 12.1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 30 20:07:44 UTC 2011 - coolo@suse.com Fri Sep 30 20:07:44 UTC 2011 - coolo@suse.com

View File

@ -87,9 +87,13 @@ PreReq: sysvinit(network)
%else %else
PreReq: sysconfig PreReq: sysconfig
%endif %endif
%{?systemd_requires}
Recommends: %{_name}-lang Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
BuildRequires: libtool BuildRequires: libtool
%if %suse_version >= 1210
BuildRequires: systemd
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -865,21 +869,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f -y avahi-daemon}
%{fillup_and_insserv -f avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service
%endif
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}
%{stop_on_removal avahi-dnsconfd} %{stop_on_removal avahi-dnsconfd}
%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
%endif
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%{restart_on_update avahi-daemon} %{restart_on_update avahi-daemon}
%{restart_on_update avahi-dnsconfd} %{restart_on_update avahi-dnsconfd}
%insserv_cleanup %insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig