rpms/avahi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

change avahi-daemon initscript to start after messagebus

Browse Source
This commit is contained in:
jvdias 2005-10-28 23:28:55 +00:00
parent 0c87b27535
commit c5c9d50f6e
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
avahi.spec
View File

@ -1,6 +1,6 @@
Name: avahi Name: avahi
Version: 0.5.2 Version: 0.5.2
Release: 2 Release: 3
Summary: local network service discovery Summary: local network service discovery
Group: System Environment/Base Group: System Environment/Base
@ -8,10 +8,13 @@ License: LGPL
URL: http://www.freedesktop.org/Software/Avahi URL: http://www.freedesktop.org/Software/Avahi
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch1: avahi-0.5.2-fedora.patch Patch1: avahi-0.5.2-fedora.patch
Patch2: avahi-0.5.2-start_after_dbus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, gtk2-devel, qt-devel, libdaemon-devel, dbus-devel, expat-devel, python, dbus-python BuildRequires: doxygen, gtk2-devel, qt-devel, libdaemon-devel, dbus-devel, expat-devel, python, dbus-python
Requires: dbus Requires: dbus
Obsoletes: howl, howl-libs
%description %description
Avahi is a system which facilitates service discovery on Avahi is a system which facilitates service discovery on
@ -72,6 +75,7 @@ necessary for developing programs using avahi with Qt3.
Summary: libraries and header files for avahi development Summary: libraries and header files for avahi development
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version} Requires: %{name} = %{version}
Obsoletes: howl-devel
%description devel %description devel
The avahi-devel package contains the header files and libraries The avahi-devel package contains the header files and libraries
@ -82,6 +86,7 @@ necessary for developing programs using avahi.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .fedora %patch1 -p1 -b .fedora
%patch2 -p1 -b .start_after_dbus
%build %build
# auto* update needed for avahi-0.5.2-fedora.patch # auto* update needed for avahi-0.5.2-fedora.patch
@ -117,8 +122,18 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
# We should realy makee dbus reload the system.d config here. Dunno how though. if [ "$1" -eq 1 ]; then
/sbin/chkconfig --add avahi-daemon /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
# We should realy make dbus reload the system.d config here. Dunno how though.
# kill -HUP `cat /var/run/messagebus.pid` ?
elif [ "$1" -gt 1 ]; then
# reset initscript run order:
LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1
# pre 0.5.2-3, avahi-daemon initscript had 'chkconfig: 345 34 66',
# so it got started AFTER messagebus ( 97 ) and was unable to start.
# It now has 'chkconfig: 345 98 02'.
/sbin/service avahi-daemon condrestart >/dev/null 2>&1
fi;
%postun %postun
/sbin/ldconfig /sbin/ldconfig
@ -184,6 +199,9 @@ fi
%{_includedir}/avahi-qt3 %{_includedir}/avahi-qt3
%changelog %changelog
* Fri Oct 28 2005 Jason Vas Dias<jvdias@redhat.com> - 0.5.2-3
- change initscript to start avahi-daemon AFTER messagebus
* Wed Oct 26 2005 Karsten Hopp <karsten@redhat.de> 0.5.2-2 * Wed Oct 26 2005 Karsten Hopp <karsten@redhat.de> 0.5.2-2
- add buildrequires dbus-python - add buildrequires dbus-python