diff --git a/avahi.spec b/avahi.spec index 7215c7d..56d0ede 100644 --- a/avahi.spec +++ b/avahi.spec @@ -5,14 +5,14 @@ %define WITH_MONO 0 %endif Name: avahi -Version: 0.6.20 -Release: 7%{?dist} +Version: 0.6.21 +Release: 8%{?dist} Summary: Local network service discovery Group: System Environment/Base -License: LGPL +License: LGPLv2 URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: dbus, expat, python, dbus-python +Requires: dbus, expat Requires: libdaemon >= 0.11 Requires(post): initscripts, chkconfig, ldconfig Requires(pre): shadow-utils @@ -30,15 +30,19 @@ BuildRequires: expat-devel BuildRequires: python BuildRequires: gdbm-devel BuildRequires: pygtk2 +BuildRequires: automake libtool %if %{WITH_MONO} BuildRequires: mono-devel >= 1.1.13 %endif Obsoletes: howl Source0: http://avahi.org/download/%{name}-%{version}.tar.gz # enable mono's mcs to work in beehive buildroot: -Patch0: avahi-0.6.20-cleanup-dns-compression-table.patch -Patch1: avahi-0.6.20-make-known-answers-not-conflict.patch -Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch +Patch1: avahi-0.6.21-avahi-browse-help-fix.patch +Patch2: avahi-0.6.3-MONO_SHARED_DIR.patch +Patch3: avahi-0.6.21-initscript.patch +Patch4: avahi-0.6.21-libdns_sd-fix.patch +Patch5: avahi-0.6.21-resolv-conf.patch +Patch6: avahi-0.6.21-multiarch.patch Patch7: avahi-poof.patch %description @@ -51,12 +55,21 @@ shared. This kind of technology is already found in MacOS X (branded convenient. %package tools -Summary: Tools for mDNS browsing and publishing +Summary: Command line tools for mDNS browsing and publishing Group: System Environment/Base -Requires: %{name} = %{version}, gtk2, pygtk2, pygtk2-libglade, gdbm +Requires: %{name} = %{version}, gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python %description tools -Tools that use avahi to browse and publish mDNS services and hosts. +Command line tools that use avahi to browse and publish mDNS services. + +%package ui-tools +Summary: UI tools for mDNS browsing +Group: System Environment/Base +Requires: %{name} = %{version} +Requires: %{name}-ui = %{version} + +%description ui-tools +Graphical user interface tools that use Avahi to browse for mDNS services. %package glib Summary: Glib libraries for avahi @@ -91,6 +104,7 @@ Summary: Libraries and header files for Avahi UI development Group: Development/Libraries Requires: %{name}-devel = %{version} Requires: %{name}-ui = %{version} +Requires: %{name}-glib-devel = %{version} %description ui-devel The avahi-ui-devel package contains the header files and libraries @@ -209,15 +223,20 @@ fashion with mDNS. %prep %setup -q +%patch1 -p0 -b .avahi-browse-help-fix %if %{WITH_MONO} -%patch6 -p1 -b .MONO_SHARED_DIR +%patch2 -p1 -b .MONO_SHARED_DIR %endif -%patch0 -p0 -b .cleanup-dns-compression-table -%patch1 -p2 -b .make-known-answers-not-conflict +%patch3 -p0 -b .initscript +%patch4 -p0 -b .dns_sd +%patch5 -p2 -b .resolv_conf +%patch6 -p2 -b .multiarch %patch7 -p0 -b .poof %build +aclocal -I common +automake %configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd \ %if %{WITH_COMPAT_DNSSD} --enable-compat-libdns_sd \ @@ -236,7 +255,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # remove example -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service # remove desktop file for avahi-discover rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop @@ -342,7 +361,7 @@ fi %files %defattr(0644,root,root,0755) -%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service +%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/avahi-daemon %dir %{_sysconfdir}/avahi %dir %{_sysconfdir}/avahi/etc @@ -351,13 +370,14 @@ fi %dir %{_sysconfdir}/avahi/services %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf -%config(noreplace) %{_sysconfdir}/avahi/services/sftp-ssh.service +%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf %attr(0755,root,root) %{_sbindir}/avahi-daemon %attr(0755,root,root) %{_libdir}/libavahi-common.so.* %attr(0755,root,root) %{_libdir}/libavahi-core.so.* %attr(0755,root,root) %{_libdir}/libavahi-client.so.* %{_datadir}/avahi +%{_libdir}/avahi %exclude %{_datadir}/avahi/interfaces %{_mandir}/man5/* %{_mandir}/man8/avahi-daemon.* @@ -381,9 +401,16 @@ fi # These are .py files only, so they don't go in lib64 %{_prefix}/lib/python?.?/site-packages/* %{_mandir}/man1/* -%{_datadir}/applications/b*.desktop %{_datadir}/avahi/interfaces/ %exclude %{_bindir}/avahi-discover-standalone +%exclude %{_bindir}/b* +%exclude %{_mandir}/man1/b* + +%files ui-tools +%defattr(0644, root, root, 0755) +%attr(0755,root,root) %{_bindir}/b* +%{_mandir}/man1/b* +%{_datadir}/applications/b*.desktop %files devel %defattr(0644, root, root, 0755) @@ -468,6 +495,40 @@ fi %endif %changelog +* Tue Dec 18 2007 Lubomir Kundrak - 0.6.21-8 +- resolves #274731: add what was missing from previous change (pulled from upstream SVN r1540) + +* Mon Dec 17 2007 Lubomir Kundrak - 0.6.21-7 +- resolves #274731: fix service-types.db multiarch conflict (pulled from upstream SVN r1537) + +* Tue Sep 25 2007 Lennart Poettering - 0.6.21-6 +- resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525) + +* Thu Sep 6 2007 Lennart Poettering - 0.6.21-5 +- resolves #249044: Update init script to use runlevel 96 +- resolves #251700: Fix assertion in libdns_sd-compat + +* Thu Sep 6 2007 Lennart Poettering - 0.6.21-4 +- Ship ssh static service file by default, don't ship ssh-sftp by default +- resolves: #269741: split off avahi-ui-tools package +- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel + +* Tue Aug 28 2007 Martin Bacovsky - 0.6.21-3 +- resolves: #246875: Initscript Review + +* Sun Aug 12 2007 Lennart Poettering - 0.6.21-2 +- Fix avahi-browse --help output + +* Sun Aug 12 2007 Lennart Poettering - 0.6.21-1 +- New upstream release + +* Thu Aug 9 2007 Lennart Poettering - 0.6.20-7 +- Fix tagging borkage + +* Thu Aug 9 2007 Lennart Poettering - 0.6.20-6 +- fix avahi-autoipd corrupt packet bug +- drop dependency on python for the main package + * Mon Dec 25 2007 Dafydd Harries - 0.6.20-7 - fix typo in patch number