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

fix bugs 172034, 172772

Browse Source
This commit is contained in:
jvdias 2005-11-14 21:50:58 +00:00
parent d34a60bce8
commit b9d86a784e
1 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
avahi.spec
View File

@ -1,7 +1,7 @@
Name: avahi Name: avahi
Version: 0.5.2 Version: 0.5.2
Release: 6 Release: 7
Summary: local network service discovery Summary: Local network service discovery
Group: System Environment/Base Group: System Environment/Base
License: LGPL License: LGPL
@ -11,7 +11,7 @@ Patch1: avahi-0.5.2-fedora.patch
Patch2: avahi-0.5.2-start_after_dbus.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, libglade2-devel, libdaemon-devel, dbus-devel, expat-devel, python, dbus-python
Requires: dbus Requires: dbus
Obsoletes: howl, howl-libs Obsoletes: howl, howl-libs
@ -27,7 +27,7 @@ shared. This kind of technology is already found in MacOS X (branded
convenient. convenient.
%package tools %package tools
Summary: tools for mDNS browsing and publishing Summary: Tools for mDNS browsing and publishing
Group: System Environment/Base Group: System Environment/Base
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -35,7 +35,7 @@ Requires: %{name} = %{version}
Tools that use avahi to browse and publish mDNS services and hosts. Tools that use avahi to browse and publish mDNS services and hosts.
%package glib %package glib
Summary: glib libraries for avahi Summary: Glib libraries for avahi
Group: System Environment/Base Group: System Environment/Base
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -43,7 +43,7 @@ Requires: %{name} = %{version}
Libraries for easy use of avahi from glib applications. Libraries for easy use of avahi from glib applications.
%package glib-devel %package glib-devel
Summary: libraries and header files for avahi glib development Summary: Libraries and header files for avahi glib development
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-glib = %{version} Requires: %{name}-glib = %{version}
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
@ -64,7 +64,7 @@ Requires: qt-devel
Libraries for easy use of avahi from Qt3 applications. Libraries for easy use of avahi from Qt3 applications.
%package qt3-devel %package qt3-devel
Summary: libraries and header files for avahi Qt3 development Summary: Libraries and header files for avahi Qt3 development
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
@ -73,7 +73,7 @@ The avahi-devel package contains the header files and libraries
necessary for developing programs using avahi with Qt3. necessary for developing programs using avahi with Qt3.
%package devel %package devel
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 Obsoletes: howl-devel
@ -114,6 +114,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
# remove desktop file for avahi-discover # remove desktop file for avahi-discover
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
# create /var/run/avahi-daemon to ensure correct selinux policy for it:
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -137,70 +140,85 @@ elif [ "$1" -gt 1 ]; then
/sbin/service avahi-daemon condrestart >/dev/null 2>&1 /sbin/service avahi-daemon condrestart >/dev/null 2>&1
fi; fi;
%postun %postun -p /sbin/ldconfig
/sbin/ldconfig
%preun %preun
if [ $1 = 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
fi fi
%post glib -p /sbin/ldconfig
%postun glib -p /sbin/ldconfig
%post qt3 -p /sbin/ldconfig
%postun qt3 -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,0644)
%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
%{_sysconfdir}/init.d/* %attr(755,root,root) %{_sysconfdir}/init.d/*
%dir %{_sysconfdir}/avahi %dir %attr(755,root,root) %{_sysconfdir}/avahi
%dir %{_sysconfdir}/avahi/services %dir %attr(755,root,root) %{_sysconfdir}/avahi/services
%dir %attr(755,root,root) %{_localstatedir}/run/avahi-daemon
%config %{_sysconfdir}/avahi/avahi-daemon.conf %config %{_sysconfdir}/avahi/avahi-daemon.conf
%config %{_sysconfdir}/avahi/avahi-dnsconfd.action %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
%config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
%{_sbindir}/* %attr(755,root,root) %{_sbindir}/*
%{_libdir}/libavahi-common.so* %attr(755,root,root) %{_libdir}/libavahi-common.so.*
%{_libdir}/libavahi-core.so* %attr(755,root,root) %{_libdir}/libavahi-core.so.*
%{_libdir}/libavahi-client.so* %attr(755,root,root) %{_libdir}/libavahi-client.so.*
%{_datadir}/avahi %attr(755,root,root) %{_datadir}/avahi
%exclude %{_datadir}/avahi/interfaces %exclude %{_datadir}/avahi/interfaces
%{_mandir}/man5/* %{_mandir}/man5/*
%{_mandir}/man8/* %{_mandir}/man8/*
%files tools %files tools
%defattr(-, root, root) %defattr(-, root, root, 0644)
%{_bindir}/* %attr(755,root,root) %{_bindir}/*
# These are .py files only, so they don't go in lib64 # These are .py files only, so they don't go in lib64
%{_prefix}/lib/python2.4/site-packages/* %attr(755,root,root) %{_prefix}/lib/python2.4/site-packages/*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_datadir}/avahi/interfaces %attr(755,root,root) %{_datadir}/avahi/interfaces/
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root, 0644)
%{_libdir}/libavahi-common.so %attr(755,root,root) %{_libdir}/libavahi-common.so
%{_libdir}/libavahi-core.so %attr(755,root,root) %{_libdir}/libavahi-core.so
%{_libdir}/libavahi-client.so %attr(755,root,root) %{_libdir}/libavahi-client.so
%{_includedir}/avahi-client %{_includedir}/avahi-client/
%{_includedir}/avahi-common %{_includedir}/avahi-common/
%{_includedir}/avahi-core %{_includedir}/avahi-core/
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/avahi-core.pc
%{_libdir}/pkgconfig/avahi-client.pc
%files glib %files glib
%defattr(-, root, root) %defattr(-, root, root, 0755)
%{_libdir}/libavahi-glib.so* %{_libdir}/libavahi-glib.so.*
%{_libdir}/pkgconfig/avahi-glib.pc
%files glib-devel %files glib-devel
%defattr(-, root, root) %defattr(-, root, root, 0644)
%{_libdir}/libavahi-glib.so %attr(755,root,root) %{_libdir}/libavahi-glib.so
%{_includedir}/avahi-glib %{_includedir}/avahi-glib
%files qt3 %files qt3
%defattr(-, root, root) %defattr(-, root, root, 0755)
%{_libdir}/libavahi-qt3.so* %{_libdir}/libavahi-qt3.so.*
%{_libdir}/pkgconfig/avahi-qt3.pc
%files qt3-devel %files qt3-devel
%defattr(-, root, root) %defattr(-, root, root, 0644)
%{_libdir}/libavahi-qt3.so %attr(755,root,root) %{_libdir}/libavahi-qt3.so
%{_includedir}/avahi-qt3 %{_includedir}/avahi-qt3
%changelog %changelog
* Mon Nov 14 2005 Jason Vas Dias<jvdias@redhat.com> - 0.5.2-7
- fix bug 172034: fix ownership of /var/run/avahi-daemon/
- fix bug 172772: .spec file improvements from matthias@rpmforge.net
* Mon Oct 31 2005 Jason Vas Dias<jvdias@redhat.com> - 0.5.2-6 * Mon Oct 31 2005 Jason Vas Dias<jvdias@redhat.com> - 0.5.2-6
- put back avahi-devel Obsoletes: howl-devel - put back avahi-devel Obsoletes: howl-devel