Accepting request 356199 from home:dimstar:branches:GNOME:Factory
- No longer install sysv services: the systemd services have been installed for a long time already and are masking the sysv scripts; those scripts existance only add confusion (boo#959908). OBS-URL: https://build.opensuse.org/request/show/356199 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=122
This commit is contained in:
Bjørn Lie
Git OBS Bridge
parent
abde4125bb
commit
b676406673
@ -1,61 +0,0 @@
|
||||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: avahi-bookmarks
|
||||
# Required-Start: $network $remote_fs avahi-dnsconfd
|
||||
# Required-Stop: $network $remote_fs avahi-dnsconfd
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop:
|
||||
# Short-Description: ZeroConf Bookmarks server
|
||||
# Description: Avahi ZeroConf Bookmarks server
|
||||
### END INIT INFO
|
||||
|
||||
AVAHI_BIN=/usr/bin/avahi-bookmarks
|
||||
test -x $AVAHI_BIN || exit 5
|
||||
|
||||
. /etc/rc.status
|
||||
rc_reset
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting Avahi Bookmarks server"
|
||||
/sbin/startproc -q -u avahi $AVAHI_BIN
|
||||
rc_status -v
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down Avahi Bookmarks server"
|
||||
/sbin/killproc $AVAHI_BIN
|
||||
rc_status -v
|
||||
;;
|
||||
try-restart|condrestart)
|
||||
if test "$1" = "condrestart"; then
|
||||
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
|
||||
fi
|
||||
$0 status
|
||||
if test $? = 0; then
|
||||
$0 restart
|
||||
else
|
||||
rc_reset
|
||||
fi
|
||||
rc_status
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
rc_status
|
||||
;;
|
||||
force-reload|reload)
|
||||
echo -n "Reloading Avahi Bookmarks server"
|
||||
$AVAHI_BIN -r
|
||||
rc_status -v
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for Avahi Bookmarks server: "
|
||||
/sbin/checkproc $AVAHI_BIN
|
||||
rc_status -v
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-glib2
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -55,7 +55,6 @@ Group: System/Daemons
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source2: avahi-bookmarks.init
|
||||
Source3: avahi.firewall
|
||||
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
|
||||
Source4: avahi-glib-gettext.m4
|
||||
@ -887,6 +886,8 @@ cd avahi-sharp
|
||||
cd ../avahi-ui-sharp
|
||||
%endif
|
||||
%makeinstall
|
||||
# do not install sysv init scripts
|
||||
rm -rf %{buildroot}%{_sysconfdir}/init.d/
|
||||
%if !%build_core
|
||||
cd ..
|
||||
make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||
@ -916,11 +917,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/avahi-autoipd
|
||||
sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
@ -996,22 +995,16 @@ fi
|
||||
%post
|
||||
%{fillup_only -n avahi}
|
||||
%{fillup_only -ns security checksig}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_add_post avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%{stop_on_removal avahi-daemon}
|
||||
%{stop_on_removal avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%{restart_on_update avahi-daemon}
|
||||
%{restart_on_update avahi-dnsconfd}
|
||||
%insserv_cleanup
|
||||
%if %suse_version >= 1210
|
||||
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
|
||||
@ -1046,31 +1039,10 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
|
||||
|
||||
%postun -n libhowl0 -p /sbin/ldconfig
|
||||
|
||||
%pre -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then
|
||||
touch var/adm/python_avahi_needs_restart
|
||||
fi
|
||||
|
||||
%post -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test -f var/adm/python_avahi_needs_restart ; then
|
||||
rm var/adm/python_avahi_needs_restart
|
||||
test -f /etc/sysconfig/services && . /etc/sysconfig/services
|
||||
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then
|
||||
/etc/init.d/avahi-bookmarks try-restart > /dev/null || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%preun -n python-avahi
|
||||
# FIXME: Package was renamed, check for this case!
|
||||
%{stop_on_removal avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
|
||||
%postun -n python-avahi
|
||||
%{restart_on_update avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
%if %build_glib2
|
||||
@ -1141,8 +1113,6 @@ fi
|
||||
%{_sysconfdir}/avahi/services/*.service
|
||||
%config(noreplace) %{_sysconfdir}/avahi/hosts
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
|
||||
%dir %{_prefix}/lib/avahi
|
||||
@ -1185,8 +1155,6 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/avahi-bookmarks
|
||||
%doc %{_mandir}/man1/avahi-bookmarks.1*
|
||||
%{_sbindir}/rcavahi-bookmarks
|
||||
%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
%dir %{python_sitelib}/avahi
|
||||
%{python_sitelib}/avahi/__init__.py*
|
||||
%{python_sitelib}/avahi/ServiceTypeDatabase.py
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-mono
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -55,7 +55,6 @@ Group: Development/Languages/Mono
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source2: avahi-bookmarks.init
|
||||
Source3: avahi.firewall
|
||||
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
|
||||
Source4: avahi-glib-gettext.m4
|
||||
@ -887,6 +886,8 @@ cd avahi-sharp
|
||||
cd ../avahi-ui-sharp
|
||||
%endif
|
||||
%makeinstall
|
||||
# do not install sysv init scripts
|
||||
rm -rf %{buildroot}%{_sysconfdir}/init.d/
|
||||
%if !%build_core
|
||||
cd ..
|
||||
make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||
@ -916,11 +917,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/avahi-autoipd
|
||||
sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
@ -996,22 +995,16 @@ fi
|
||||
%post
|
||||
%{fillup_only -n avahi}
|
||||
%{fillup_only -ns security checksig}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_add_post avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%{stop_on_removal avahi-daemon}
|
||||
%{stop_on_removal avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%{restart_on_update avahi-daemon}
|
||||
%{restart_on_update avahi-dnsconfd}
|
||||
%insserv_cleanup
|
||||
%if %suse_version >= 1210
|
||||
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
|
||||
@ -1046,31 +1039,10 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
|
||||
|
||||
%postun -n libhowl0 -p /sbin/ldconfig
|
||||
|
||||
%pre -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then
|
||||
touch var/adm/python_avahi_needs_restart
|
||||
fi
|
||||
|
||||
%post -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test -f var/adm/python_avahi_needs_restart ; then
|
||||
rm var/adm/python_avahi_needs_restart
|
||||
test -f /etc/sysconfig/services && . /etc/sysconfig/services
|
||||
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then
|
||||
/etc/init.d/avahi-bookmarks try-restart > /dev/null || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%preun -n python-avahi
|
||||
# FIXME: Package was renamed, check for this case!
|
||||
%{stop_on_removal avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
|
||||
%postun -n python-avahi
|
||||
%{restart_on_update avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
%if %build_glib2
|
||||
@ -1141,8 +1113,6 @@ fi
|
||||
%{_sysconfdir}/avahi/services/*.service
|
||||
%config(noreplace) %{_sysconfdir}/avahi/hosts
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
|
||||
%dir %{_prefix}/lib/avahi
|
||||
@ -1185,8 +1155,6 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/avahi-bookmarks
|
||||
%doc %{_mandir}/man1/avahi-bookmarks.1*
|
||||
%{_sbindir}/rcavahi-bookmarks
|
||||
%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
%dir %{python_sitelib}/avahi
|
||||
%{python_sitelib}/avahi/__init__.py*
|
||||
%{python_sitelib}/avahi/ServiceTypeDatabase.py
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-qt4
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -55,7 +55,6 @@ Group: System/GUI/KDE
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source2: avahi-bookmarks.init
|
||||
Source3: avahi.firewall
|
||||
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
|
||||
Source4: avahi-glib-gettext.m4
|
||||
@ -889,6 +888,8 @@ cd avahi-sharp
|
||||
cd ../avahi-ui-sharp
|
||||
%endif
|
||||
%makeinstall
|
||||
# do not install sysv init scripts
|
||||
rm -rf %{buildroot}%{_sysconfdir}/init.d/
|
||||
%if !%build_core
|
||||
cd ..
|
||||
make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||
@ -918,11 +919,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/avahi-autoipd
|
||||
sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
@ -998,22 +997,16 @@ fi
|
||||
%post
|
||||
%{fillup_only -n avahi}
|
||||
%{fillup_only -ns security checksig}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_add_post avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%{stop_on_removal avahi-daemon}
|
||||
%{stop_on_removal avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%{restart_on_update avahi-daemon}
|
||||
%{restart_on_update avahi-dnsconfd}
|
||||
%insserv_cleanup
|
||||
%if %suse_version >= 1210
|
||||
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
|
||||
@ -1048,31 +1041,10 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
|
||||
|
||||
%postun -n libhowl0 -p /sbin/ldconfig
|
||||
|
||||
%pre -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then
|
||||
touch var/adm/python_avahi_needs_restart
|
||||
fi
|
||||
|
||||
%post -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test -f var/adm/python_avahi_needs_restart ; then
|
||||
rm var/adm/python_avahi_needs_restart
|
||||
test -f /etc/sysconfig/services && . /etc/sysconfig/services
|
||||
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then
|
||||
/etc/init.d/avahi-bookmarks try-restart > /dev/null || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%preun -n python-avahi
|
||||
# FIXME: Package was renamed, check for this case!
|
||||
%{stop_on_removal avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
|
||||
%postun -n python-avahi
|
||||
%{restart_on_update avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
%if %build_glib2
|
||||
@ -1143,8 +1115,6 @@ fi
|
||||
%{_sysconfdir}/avahi/services/*.service
|
||||
%config(noreplace) %{_sysconfdir}/avahi/hosts
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
|
||||
%dir %{_prefix}/lib/avahi
|
||||
@ -1187,8 +1157,6 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/avahi-bookmarks
|
||||
%doc %{_mandir}/man1/avahi-bookmarks.1*
|
||||
%{_sbindir}/rcavahi-bookmarks
|
||||
%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
%dir %{python_sitelib}/avahi
|
||||
%{python_sitelib}/avahi/__init__.py*
|
||||
%{python_sitelib}/avahi/ServiceTypeDatabase.py
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 13:58:10 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- No longer install sysv services: the systemd services have been
|
||||
installed for a long time already and are masking the sysv
|
||||
scripts; those scripts existance only add confusion (boo#959908).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 19 09:24:58 UTC 2015 - zaitor@opensuse.org
|
||||
|
||||
|
||||
42
avahi.spec
42
avahi.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -57,7 +57,6 @@ Group: System/Daemons
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source2: avahi-bookmarks.init
|
||||
Source3: avahi.firewall
|
||||
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
|
||||
Source4: avahi-glib-gettext.m4
|
||||
@ -889,6 +888,8 @@ cd avahi-sharp
|
||||
cd ../avahi-ui-sharp
|
||||
%endif
|
||||
%makeinstall
|
||||
# do not install sysv init scripts
|
||||
rm -rf %{buildroot}%{_sysconfdir}/init.d/
|
||||
%if !%build_core
|
||||
cd ..
|
||||
make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||
@ -918,11 +919,9 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/avahi-autoipd
|
||||
sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
@ -998,22 +997,16 @@ fi
|
||||
%post
|
||||
%{fillup_only -n avahi}
|
||||
%{fillup_only -ns security checksig}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_add_post avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%{stop_on_removal avahi-daemon}
|
||||
%{stop_on_removal avahi-dnsconfd}
|
||||
%if %suse_version >= 1210
|
||||
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%{restart_on_update avahi-daemon}
|
||||
%{restart_on_update avahi-dnsconfd}
|
||||
%insserv_cleanup
|
||||
%if %suse_version >= 1210
|
||||
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
|
||||
@ -1048,31 +1041,10 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
|
||||
|
||||
%postun -n libhowl0 -p /sbin/ldconfig
|
||||
|
||||
%pre -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then
|
||||
touch var/adm/python_avahi_needs_restart
|
||||
fi
|
||||
|
||||
%post -n python-avahi
|
||||
# For update from == 10.3:
|
||||
# Restart will not happen due to package rename. Handle it.
|
||||
if test -f var/adm/python_avahi_needs_restart ; then
|
||||
rm var/adm/python_avahi_needs_restart
|
||||
test -f /etc/sysconfig/services && . /etc/sysconfig/services
|
||||
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then
|
||||
/etc/init.d/avahi-bookmarks try-restart > /dev/null || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%preun -n python-avahi
|
||||
# FIXME: Package was renamed, check for this case!
|
||||
%{stop_on_removal avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
|
||||
%postun -n python-avahi
|
||||
%{restart_on_update avahi-bookmarks}
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
%if %build_glib2
|
||||
@ -1143,8 +1115,6 @@ fi
|
||||
%{_sysconfdir}/avahi/services/*.service
|
||||
%config(noreplace) %{_sysconfdir}/avahi/hosts
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
|
||||
%dir %{_prefix}/lib/avahi
|
||||
@ -1187,8 +1157,6 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/avahi-bookmarks
|
||||
%doc %{_mandir}/man1/avahi-bookmarks.1*
|
||||
%{_sbindir}/rcavahi-bookmarks
|
||||
%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
%dir %{python_sitelib}/avahi
|
||||
%{python_sitelib}/avahi/__init__.py*
|
||||
%{python_sitelib}/avahi/ServiceTypeDatabase.py
|
||||
|
||||
Loading…
Reference in New Issue
Block a user