rpms/avahi/devel avahi.spec,1.8,1.9

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1377

Modified Files:
	avahi.spec 
Log Message:
fix bugs 172034, 172772


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- avahi.spec	31 Oct 2005 18:24:35 -0000	1.8
+++ avahi.spec	14 Nov 2005 21:50:58 -0000	1.9
@@ -1,17 +1,17 @@
 Name:           avahi
 Version:        0.5.2
-Release:        6
-Summary:        local network service discovery 
+Release:        7
+Summary:        Local network service discovery 
 
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://www.freedesktop.org/Software/Avahi
 Source0:        %{name}-%{version}.tar.gz
 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)
+Patch2:		avahi-0.5.2-start_after_dbus.patch
+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
 Obsoletes:	howl, howl-libs
@@ -27,7 +27,7 @@
 convenient.
 
 %package tools
-Summary: tools for mDNS browsing and publishing
+Summary: Tools for mDNS browsing and publishing
 Group: System Environment/Base
 Requires: %{name} = %{version}
 
@@ -35,7 +35,7 @@
 Tools that use avahi to browse and publish mDNS services and hosts.
 
 %package glib
-Summary: glib libraries for avahi
+Summary: Glib libraries for avahi
 Group: System Environment/Base
 Requires: %{name} = %{version}
 
@@ -43,7 +43,7 @@
 Libraries for easy use of avahi from glib applications.
 
 %package glib-devel
-Summary: libraries and header files for avahi glib development
+Summary: Libraries and header files for avahi glib development
 Group: Development/Libraries
 Requires: %{name}-glib = %{version}
 Requires: %{name}-devel = %{version}
@@ -64,7 +64,7 @@
 Libraries for easy use of avahi from Qt3 applications.
 
 %package qt3-devel
-Summary: libraries and header files for avahi Qt3 development
+Summary: Libraries and header files for avahi Qt3 development
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}
 
@@ -73,7 +73,7 @@
 necessary for developing programs using avahi with Qt3.
 
 %package devel
-Summary: libraries and header files for avahi development
+Summary: Libraries and header files for avahi development
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Obsoletes: howl-devel
@@ -114,6 +114,9 @@
 # remove desktop file for avahi-discover
 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
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,70 +140,85 @@
    /sbin/service avahi-daemon condrestart >/dev/null 2>&1
 fi;
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
+if [ "$1" -eq 0 ]; then
     service avahi-daemon stop > /dev/null 2>&1
     /sbin/chkconfig --del avahi-daemon
 fi
 
+%post glib -p /sbin/ldconfig
+
+%postun glib -p /sbin/ldconfig
+
+%post qt3 -p /sbin/ldconfig
+
+%postun qt3 -p /sbin/ldconfig
+
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root,0644)
 %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
-%{_sysconfdir}/init.d/*
-%dir %{_sysconfdir}/avahi
-%dir %{_sysconfdir}/avahi/services
+%attr(755,root,root) %{_sysconfdir}/init.d/*
+%dir %attr(755,root,root) %{_sysconfdir}/avahi
+%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-dnsconfd.action
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
-%{_sbindir}/*
-%{_libdir}/libavahi-common.so*
-%{_libdir}/libavahi-core.so*
-%{_libdir}/libavahi-client.so*
-%{_datadir}/avahi
+%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libdir}/libavahi-common.so.*
+%attr(755,root,root) %{_libdir}/libavahi-core.so.*
+%attr(755,root,root) %{_libdir}/libavahi-client.so.*
+%attr(755,root,root) %{_datadir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
 %files tools
-%defattr(-, root, root)
-%{_bindir}/*
+%defattr(-, root, root, 0644)
+%attr(755,root,root) %{_bindir}/*
 # 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/*
-%{_datadir}/avahi/interfaces
+%attr(755,root,root) %{_datadir}/avahi/interfaces/
 
 %files devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-common.so
-%{_libdir}/libavahi-core.so
-%{_libdir}/libavahi-client.so
-%{_includedir}/avahi-client
-%{_includedir}/avahi-common
-%{_includedir}/avahi-core
-%{_libdir}/pkgconfig/*
+%defattr(-, root, root, 0644)
+%attr(755,root,root) %{_libdir}/libavahi-common.so
+%attr(755,root,root) %{_libdir}/libavahi-core.so
+%attr(755,root,root) %{_libdir}/libavahi-client.so
+%{_includedir}/avahi-client/
+%{_includedir}/avahi-common/
+%{_includedir}/avahi-core/
+%{_libdir}/pkgconfig/avahi-core.pc
+%{_libdir}/pkgconfig/avahi-client.pc
 
 %files glib
-%defattr(-, root, root)
-%{_libdir}/libavahi-glib.so*
+%defattr(-, root, root, 0755)
+%{_libdir}/libavahi-glib.so.*
+%{_libdir}/pkgconfig/avahi-glib.pc
 
 %files glib-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-glib.so
+%defattr(-, root, root, 0644)
+%attr(755,root,root) %{_libdir}/libavahi-glib.so
 %{_includedir}/avahi-glib
 
 %files qt3
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so*
+%defattr(-, root, root, 0755)
+%{_libdir}/libavahi-qt3.so.*
+%{_libdir}/pkgconfig/avahi-qt3.pc
 
 %files qt3-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so
+%defattr(-, root, root, 0644)
+%attr(755,root,root) %{_libdir}/libavahi-qt3.so
 %{_includedir}/avahi-qt3
 
 %changelog
+* Mon Nov 14 2005 Jason Vas Dias<jvdias at redhat.com> - 0.5.2-7
+- fix bug 172034: fix ownership of /var/run/avahi-daemon/
+- fix bug 172772: .spec file improvements from matthias at rpmforge.net
+ 
 * Mon Oct 31 2005 Jason Vas Dias<jvdias at redhat.com> - 0.5.2-6
 - put back avahi-devel Obsoletes: howl-devel