upgrade to 0.6.7; fix avahi-dnsconfd initscript
This commit is contained in:
jvdias
parent
9ba635ffa1
commit
226db407b7
@ -5,3 +5,4 @@ avahi-0.6.3.tar.gz
|
|||||||
avahi-0.6.4.tar.gz
|
avahi-0.6.4.tar.gz
|
||||||
avahi-0.6.5.tar.gz
|
avahi-0.6.5.tar.gz
|
||||||
avahi-0.6.6.tar.gz
|
avahi-0.6.6.tar.gz
|
||||||
|
avahi-0.6.7.tar.gz
|
||||||
|
|||||||
42
avahi.spec
42
avahi.spec
@ -3,8 +3,8 @@
|
|||||||
%define WITH_MONO 0
|
%define WITH_MONO 0
|
||||||
%endif
|
%endif
|
||||||
Name: avahi
|
Name: avahi
|
||||||
Version: 0.6.6
|
Version: 0.6.7
|
||||||
Release: 4
|
Release: 1
|
||||||
Summary: Local network service discovery
|
Summary: Local network service discovery
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: LGPL
|
License: LGPL
|
||||||
@ -29,6 +29,7 @@ Patch8: avahi-0.6.3-lockfile.patch
|
|||||||
Patch9: avahi-0.6.4-localtime.patch
|
Patch9: avahi-0.6.4-localtime.patch
|
||||||
Patch10: avahi-0.6.4-bz178784.patch
|
Patch10: avahi-0.6.4-bz178784.patch
|
||||||
Patch11: avahi-0.6.5-bz179448.patch
|
Patch11: avahi-0.6.5-bz179448.patch
|
||||||
|
Patch12: avahi-0.6.7-initscript.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Avahi is a system which facilitates service discovery on
|
Avahi is a system which facilitates service discovery on
|
||||||
@ -115,19 +116,28 @@ necessary for developing programs using avahi.
|
|||||||
%setup -q
|
%setup -q
|
||||||
#%patch1 -p1 -b .fedora
|
#%patch1 -p1 -b .fedora
|
||||||
#^- this patch now upstream
|
#^- this patch now upstream
|
||||||
%patch2 -p1 -b .start_after_dbus
|
#%patch2 -p1 -b .start_after_dbus
|
||||||
%patch3 -p1 -b .initscript_status
|
#^- this patch now upstream
|
||||||
|
#%patch3 -p1 -b .initscript_status
|
||||||
|
#^- this patch now upstream
|
||||||
#%patch4 -p1 -b .dbus-0.6
|
#%patch4 -p1 -b .dbus-0.6
|
||||||
#^- this patch now upstream
|
#^- this patch now upstream
|
||||||
%patch5 -p1 -b .bz177148
|
#%patch5 -p1 -b .bz177148
|
||||||
|
#^- this patch now upstream
|
||||||
%if %{WITH_MONO}
|
%if %{WITH_MONO}
|
||||||
%patch6 -p1 -b .MONO_SHARED_DIR
|
%patch6 -p1 -b .MONO_SHARED_DIR
|
||||||
%endif
|
%endif
|
||||||
%patch7 -p1 -b .i18n
|
#%patch7 -p1 -b .i18n
|
||||||
%patch8 -p1 -b .lockfile
|
#^- this patch now upstream
|
||||||
%patch9 -p1 -b .localtime
|
#%patch8 -p1 -b .lockfile
|
||||||
%patch10 -p1 -b .bz178746
|
#^- this patch now upstream
|
||||||
%patch11 -p1 -b .bz179448
|
#%patch9 -p1 -b .localtime
|
||||||
|
#^- this patch now upstream
|
||||||
|
#%patch10 -p1 -b .bz178746
|
||||||
|
#^- this patch now upstream
|
||||||
|
#%patch11 -p1 -b .bz179448
|
||||||
|
#^- this patch now upstream
|
||||||
|
%patch12 -p1 -b .initscript
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# auto* update needed for avahi-0.5.2-fedora.patch
|
# auto* update needed for avahi-0.5.2-fedora.patch
|
||||||
@ -192,6 +202,11 @@ if [ "$1" -eq 1 ]; then
|
|||||||
# if user has not configured avahi service at all
|
# if user has not configured avahi service at all
|
||||||
/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
|
/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
|
||||||
fi;
|
fi;
|
||||||
|
if ! /sbin/chkconfig --list avahi-dnsconfd >/dev/null 2>&1 ; then
|
||||||
|
# avahi-dnsconfd NOT run by default in any runlevel; add it
|
||||||
|
# so system-config-services can see it
|
||||||
|
/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1
|
||||||
|
fi;
|
||||||
# We should realy make dbus reload the system.d config here. Dunno how though.
|
# We should realy make dbus reload the system.d config here. Dunno how though.
|
||||||
# kill -HUP `cat /var/run/messagebus.pid` ?
|
# kill -HUP `cat /var/run/messagebus.pid` ?
|
||||||
if [ -s /etc/localtime ]; then
|
if [ -s /etc/localtime ]; then
|
||||||
@ -207,6 +222,7 @@ elif [ "$1" -gt 1 ]; then
|
|||||||
# so it got started AFTER messagebus ( 97 ) and was unable to start.
|
# so it got started AFTER messagebus ( 97 ) and was unable to start.
|
||||||
# It now has 'chkconfig: 345 98 02'.
|
# It now has 'chkconfig: 345 98 02'.
|
||||||
/sbin/service avahi-daemon condrestart >/dev/null 2>&1
|
/sbin/service avahi-daemon condrestart >/dev/null 2>&1
|
||||||
|
/sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
@ -215,6 +231,8 @@ fi;
|
|||||||
if [ "$1" -eq 0 ]; then
|
if [ "$1" -eq 0 ]; then
|
||||||
service avahi-daemon stop > /dev/null 2>&1
|
service avahi-daemon stop > /dev/null 2>&1
|
||||||
/sbin/chkconfig --del avahi-daemon
|
/sbin/chkconfig --del avahi-daemon
|
||||||
|
service avahi-dnsconfd stop >/dev/null 2>&1
|
||||||
|
/sbin/chkconfig --del avahi-dnsconfd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%post glib -p /sbin/ldconfig
|
%post glib -p /sbin/ldconfig
|
||||||
@ -232,6 +250,7 @@ fi
|
|||||||
%dir %{_sysconfdir}/avahi
|
%dir %{_sysconfdir}/avahi
|
||||||
%dir %{_sysconfdir}/avahi/etc
|
%dir %{_sysconfdir}/avahi/etc
|
||||||
%ghost %{_sysconfdir}/avahi/etc/localtime
|
%ghost %{_sysconfdir}/avahi/etc/localtime
|
||||||
|
%{_sysconfdir}/avahi/hosts
|
||||||
%dir %{_sysconfdir}/avahi/services
|
%dir %{_sysconfdir}/avahi/services
|
||||||
%dir %{_localstatedir}/run/avahi-daemon
|
%dir %{_localstatedir}/run/avahi-daemon
|
||||||
%config %{_sysconfdir}/avahi/avahi-daemon.conf
|
%config %{_sysconfdir}/avahi/avahi-daemon.conf
|
||||||
@ -302,6 +321,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 17 2006 Jason Vas Dias <jvdias@redhat.com> 0.6.7-1
|
||||||
|
- Upgrade to upstream version 0.6.7
|
||||||
|
|
||||||
* Fri Feb 17 2006 Karsten Hopp <karsten@redhat.de> 0.6.6-4
|
* Fri Feb 17 2006 Karsten Hopp <karsten@redhat.de> 0.6.6-4
|
||||||
- BuildRequires pygtk2
|
- BuildRequires pygtk2
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user