diff --git a/avahi.spec b/avahi.spec index 455ab04..715240c 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,21 +1,19 @@ Name: avahi Version: 0.6.1 -Release: 2.1 +Release: 3 Summary: Local network service discovery - Group: System Environment/Base License: LGPL URL: http://www.freedesktop.org/Software/Avahi +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python +Requires: dbus, libdaemon, expat, python, dbus-python, libcap +Obsoletes: howl, howl-libs Source0: %{name}-%{version}.tar.gz Patch1: avahi-0.5.2-fedora.patch Patch2: avahi-0.5.2-start_after_dbus.patch Patch3: avahi-0.6-initscript_status.patch Patch4: avahi-0.6-dbus-0.6.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python -Requires: dbus, libdaemon, expat, python, dbus-python, libcap -Obsoletes: howl, howl-libs -#Provides: howl >= 0.9.8, howl-libs >= 0.9.8 %description Avahi is a system which facilitates service discovery on @@ -79,7 +77,6 @@ Summary: Libraries and header files for avahi development Group: Development/Libraries Requires: %{name} = %{version} Obsoletes: howl-devel -#Provides: howl-devel >= 0.9.8 %description devel The avahi-devel package contains the header files and libraries @@ -129,6 +126,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} # which has been judged dangerous and is removed from the # Fedora Core distribution: rm -f $RPM_BUILD_ROOT/%{_bindir}/avahi-bookmarks $RPM_BUILD_ROOT/%{_mandir}/man1/avahi-bookmarks* +# +# move initscripts into /etc/rc.d/init.d : +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d +mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d +rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* :; %clean @@ -179,7 +181,7 @@ fi %files %defattr(0644,root,root,0755) %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service -%attr(755,root,root) %{_sysconfdir}/init.d/* +%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/* %dir %{_sysconfdir}/avahi %dir %{_sysconfdir}/avahi/services %dir %{_localstatedir}/run/avahi-daemon