rpms/avahi/devel .cvsignore, 1.20, 1.21 avahi.spec, 1.122, 1.123 sources, 1.21, 1.22
Lennart Poettering
lennart at fedoraproject.org
Tue Jun 29 02:33:04 UTC 2010
Author: lennart
Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4263
Modified Files:
.cvsignore avahi.spec sources
Log Message:
new upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 14 Apr 2009 02:14:19 -0000 1.20
+++ .cvsignore 29 Jun 2010 02:33:04 -0000 1.21
@@ -1 +1 @@
-avahi-0.6.25.tar.gz
+avahi-0.6.26.tar.gz
Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- avahi.spec 19 Apr 2010 14:48:33 -0000 1.122
+++ avahi.spec 29 Jun 2010 02:33:04 -0000 1.123
@@ -1,21 +1,24 @@
-%{?!WITH_MONO: %define WITH_MONO 1}
+%{?!WITH_MONO: %define WITH_MONO 1}
%{?!WITH_COMPAT_DNSSD: %define WITH_COMPAT_DNSSD 1}
%{?!WITH_COMPAT_HOWL: %define WITH_COMPAT_HOWL 1}
%ifarch sparc64
%define WITH_MONO 0
%endif
Name: avahi
-Version: 0.6.25
-Release: 7%{?dist}
+Version: 0.6.26
+Release: 1%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPLv2
URL: http://avahi.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: dbus, expat
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: dbus
+Requires: expat
Requires: libdaemon >= 0.11
+Requires: systemd-units
Requires(post): initscripts, chkconfig, ldconfig
Requires(pre): shadow-utils
+Requires: %{name}-libs = %{version}-%{release}
BuildRequires: automake libtool
BuildRequires: dbus-devel >= 0.90
BuildRequires: dbus-glib-devel >= 0.70
@@ -32,14 +35,13 @@ BuildRequires: expat-devel
BuildRequires: python
BuildRequires: gdbm-devel
BuildRequires: pygtk2
-BuildRequires: intltool perl-XML-Parser
+BuildRequires: intltool
+BuildRequires: perl-XML-Parser
%if %{WITH_MONO}
BuildRequires: mono-devel >= 1.1.13
%endif
-Obsoletes: howl
+Obsoletes: howl
Source0: http://avahi.org/download/%{name}-%{version}.tar.gz
-# enable mono's mcs to work in beehive buildroot:
-Patch2: avahi-0.6.3-MONO_SHARED_DIR.patch
%description
Avahi is a system which facilitates service discovery on
@@ -62,10 +64,14 @@ Command line tools that use avahi to bro
Summary: UI tools for mDNS browsing
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
-Requires: %{name}-ui = %{version}-%{release}
+Requires: %{name}-ui-gtk3 = %{version}-%{release}
Requires: vnc
Requires: openssh-clients
-Requires: gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
+Requires: pygtk2
+Requires: pygtk2-libglade
+Requires: gdbm
+Requires: python
+Requires: dbus-python
%description ui-tools
Graphical user interface tools that use Avahi to browse for mDNS services.
@@ -111,12 +117,22 @@ The avahi-gobject-devel package contains
necessary for developing programs using avahi-gobject.
%package ui
-Summary: Gtk user interface library for Avahi
+Summary: Gtk user interface library for Avahi (Gtk+ 2 version)
Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
Requires: gtk2
%description ui
-This library contains a Gtk widget for browsing services.
+This library contains a Gtk 2.x widget for browsing services.
+
+%package ui-gtk3
+Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: gtk3
+
+%description ui-gtk3
+This library contains a Gtk 3.x widget for browsing services.
%package ui-devel
Summary: Libraries and header files for Avahi UI development
@@ -169,20 +185,23 @@ necessary for developing programs using
%if %{WITH_MONO}
%package sharp
-Summary: Mono language bindings for avahi mono development
-Group: Development/Libraries
-Requires: mono-core >= 1.1.13
+Summary: Mono language bindings for avahi mono development
+Group: Development/Libraries
+Requires: mono-core >= 1.1.13
+Requires: %{name} = %{version}-%{release}
%description sharp
-The avahi-sharp package contains the files needed to develop
+The avahi-sharp package contains the files needed to develop
mono programs that use avahi.
%package ui-sharp
-Summary: Mono language bindings for avahi-ui
-Group: System Environment/Libraries
-Requires: mono-core >= 1.1.13
-Requires: gtk-sharp2
-BuildRequires: gtk-sharp2-devel
+Summary: Mono language bindings for avahi-ui
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ui = %{version}-%{release}
+Requires: mono-core >= 1.1.13
+Requires: gtk-sharp2
+BuildRequires: gtk-sharp2-devel
%description ui-sharp
The avahi-sharp package contains the files needed to run
@@ -194,14 +213,13 @@ Group: Development/Libraries
Requires: %{name}-ui-sharp = %{version}-%{release}
%description ui-sharp-devel
-The avahi-sharp-ui-devel package contains the files needed to develop
+The avahi-sharp-ui-devel package contains the files needed to develop
Mono programs that use avahi-ui.
%endif
%package libs
Summary: Libraries for avahi run-time use
Group: System Environment/Libraries
-Requires: pkgconfig
%description libs
The avahi-libs package contains the libraries needed
@@ -221,6 +239,7 @@ necessary for developing programs using
Summary: Libraries for howl compatibility
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Obsoletes: howl-libs
Provides: howl-libs
@@ -241,6 +260,7 @@ Header files for development with the ho
Summary: Libraries for Apple Bonjour mDNSResponder compatibility
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description compat-libdns_sd
Libraries for Apple Bonjour mDNSResponder compatibility.
@@ -270,6 +290,7 @@ lack a DHCP server.
Summary: Configure local unicast DNS settings based on information published in mDNS
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description dnsconfd
avahi-dnsconfd connects to a running avahi-daemon and runs the script
@@ -279,29 +300,21 @@ fashion with mDNS.
%prep
%setup -q
-%if %{WITH_MONO}
-%patch2 -p1 -b .MONO_SHARED_DIR
-%endif
-
-# nuke rpath, TODO: double-check if still required on new releases
-autoreconf -i
%build
-
-%configure --with-distro=fedora --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 \
+%configure --with-distro=fedora --disable-monodoc --with-avahi-user=avahi --with-avahi-group=avahi --with-avahi-priv-access-group=avahi --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd \
%if %{WITH_COMPAT_DNSSD}
--enable-compat-libdns_sd \
%endif
+%if %{WITH_COMPAT_HOWL}
+ --enable-compat-howl \
+%endif
%if ! %{WITH_MONO}
--disable-mono \
%endif
;
-# less invasible anti-rpath hack if one wants to avoid auto*foo
-#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
-
make %{?_smp_mflags}
-#make %{?_smp_mflags} avahi.devhelp doxygen-run
%install
rm -rf $RPM_BUILD_ROOT
@@ -313,9 +326,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
# remove example
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
-
# create /var/run/avahi-daemon to ensure correct selinux policy for it:
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/avahi-autoipd
@@ -323,20 +333,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
# remove the documentation directory - let \%doc handle it:
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-# remove avahi-bookmarks - unusable without python-twisted,
-# 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/*
-#
# Make /etc/avahi/etc/localtime owned by avahi:
mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
-#
+
# fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
%if %{WITH_COMPAT_HOWL}
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc
@@ -354,9 +354,19 @@ ln -s avahi-compat-libdns_sd/dns_sd.h $R
rm -rf $RPM_BUILD_ROOT
%pre
-/usr/sbin/groupadd -f -r avahi
-/usr/bin/id avahi >/dev/null 2>&1 || \
- /usr/sbin/useradd -r -g avahi -c 'avahi-daemon' -s /sbin/nologin -d %{_localstatedir}/run/avahi-daemon avahi
+getent group avahi >/dev/null 2>&1 || groupadd \
+ -r \
+ -g 70 \
+ avahi
+getent passwd avahi >/dev/null 2>&1 || useradd \
+ -r -l \
+ -u 70 \
+ -g avahi \
+ -d %{_localstatedir}/run/avahi-daemon \
+ -s /sbin/nologin \
+ -c "Avahi mDNS/DNS-SD Stack" \
+ avahi
+:;
%post
/sbin/ldconfig
@@ -382,9 +392,19 @@ if [ "$1" -ge "1" ]; then
fi
%pre autoipd
-/usr/sbin/groupadd -f -r avahi-autoipd
-/usr/bin/id avahi-autoipd >/dev/null 2>&1 || \
- /usr/sbin/useradd -r -g avahi-autoipd -c 'avahi-autoipd' -s /sbin/nologin -d %{_localstatedir}/lib/avahi-autoipd avahi-autoipd
+getent group avahi-autoipd >/dev/null 2>&1 || groupadd \
+ -r \
+ -g 170 \
+ avahi-autoipd
+getent passwd avahi-autoipd >/dev/null 2>&1 || useradd \
+ -r -l \
+ -u 170 \
+ -g avahi-autoipd \
+ -d %{_localstatedir}/lib/avahi-autoipd \
+ -s /sbin/nologin \
+ -c "Avahi IPv4LL Stack" \
+ avahi-autoipd
+:;
%post dnsconfd
# avahi-dnsconfd NOT run by default in any runlevel; add it
@@ -432,16 +452,22 @@ fi
%ghost %{_sysconfdir}/avahi/etc/localtime
%config(noreplace) %{_sysconfdir}/avahi/hosts
%dir %{_sysconfdir}/avahi/services
-%attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
+%ghost %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
%config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
%{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
%attr(0755,root,root) %{_sbindir}/avahi-daemon
-%{_datadir}/avahi
+%dir %{_datadir}/avahi
+%{_datadir}/avahi/*.dtd
+%{_datadir}/avahi/service-types
%{_libdir}/avahi
-%exclude %{_datadir}/avahi/interfaces
+%exclude %{_datadir}/dbus-1/interfaces/*.xml
%{_mandir}/man5/*
%{_mandir}/man8/avahi-daemon.*
+/lib/systemd/system/avahi-daemon.service
+/lib/systemd/system/avahi-daemon.socket
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+%attr(0755,root,root) %{_libdir}/libavahi-core.so.*
%files autoipd
%defattr(0644,root,root,0755)
@@ -455,24 +481,30 @@ fi
%attr(0755,root,root) %config(noreplace) %{_sysconfdir}/avahi/avahi-dnsconfd.action
%attr(0755,root,root) %{_sbindir}/avahi-dnsconfd
%{_mandir}/man8/avahi-dnsconfd.*
+/lib/systemd/system/avahi-dnsconfd.service
%files tools
%defattr(0644, root, root, 0755)
%attr(0755,root,root) %{_bindir}/*
%{_mandir}/man1/*
-%exclude %{_bindir}/avahi-discover-standalone
%exclude %{_bindir}/b*
-%exclude %{_bindir}/avahi-discover
+%exclude %{_bindir}/avahi-discover*
+%exclude %{_bindir}/avahi-bookmarks
%exclude %{_mandir}/man1/b*
%exclude %{_mandir}/man1/avahi-discover*
+%exclude %{_mandir}/man1/avahi-bookmarks*
%files ui-tools
%defattr(0644, root, root, 0755)
%attr(0755,root,root) %{_bindir}/b*
%attr(0755,root,root) %{_bindir}/avahi-discover
+# avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it...
+%attr(0755,root,root) %{_bindir}/avahi-bookmarks
%{_mandir}/man1/b*
%{_mandir}/man1/avahi-discover*
+%{_mandir}/man1/avahi-bookmarks*
%{_datadir}/applications/b*.desktop
+%{_datadir}/applications/avahi-discover.desktop
# These are .py files only, so they don't go in lib64
%{_prefix}/lib/python?.?/site-packages/*
%{_datadir}/avahi/interfaces/
@@ -491,7 +523,6 @@ fi
%files libs
%defattr(0644, root, root, 0755)
%attr(0755,root,root) %{_libdir}/libavahi-common.so.*
-%attr(0755,root,root) %{_libdir}/libavahi-core.so.*
%attr(0755,root,root) %{_libdir}/libavahi-client.so.*
%files glib
@@ -505,24 +536,34 @@ fi
%{_libdir}/pkgconfig/avahi-glib.pc
%files gobject
-%defattr(0755, root, root, 0755)
-%{_libdir}/libavahi-gobject.so.*
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libavahi-gobject.so.*
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
%files gobject-devel
%defattr(0644, root, root, 0755)
%attr(755,root,root) %{_libdir}/libavahi-gobject.so
%{_includedir}/avahi-gobject
%{_libdir}/pkgconfig/avahi-gobject.pc
+%{_datadir}/gir-1.0/Avahi-0.6.gir
+%{_datadir}/gir-1.0/AvahiCore-0.6.gir
%files ui
%defattr(0755, root, root, 0755)
%{_libdir}/libavahi-ui.so.*
+%files ui-gtk3
+%defattr(0755, root, root, 0755)
+%{_libdir}/libavahi-ui-gtk3.so.*
+
%files ui-devel
%defattr(0644, root, root, 0755)
%attr(755,root,root) %{_libdir}/libavahi-ui.so
+%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
%{_includedir}/avahi-ui
%{_libdir}/pkgconfig/avahi-ui.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
%files qt3
%defattr(0644, root, root, 0755)
@@ -589,6 +630,9 @@ fi
%endif
%changelog
+* Tue Jun 29 2010 Lennart Poettering <lpoetter at redhat.com> 0.6.26-1
+- New upstream release
+
* Mon Apr 19 2010 Bastien Nocera <bnocera at redhat.com> 0.6.25-7
- Split avahi libraries in -libs
@@ -691,7 +735,7 @@ fi
- drop dependency on python for the main package
* Wed Jul 11 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.20-5
-- add two patches which are important to get RR updating work properly.
+- add two patches which are important to get RR updating work properly.
Will be part of upstream 0.6.21
* Thu Jul 5 2007 Dan Williams <dcbw at redhat.com> - 0.6.20-4
@@ -719,7 +763,7 @@ fi
- upgrade to new upstream 0.6.17
- redundant patches removal
- removed auto* stuff from specfile since that was no longer needed
-- Resolves: #232205: 'service {avahi-dnsconfd,avahi-daemon} status'
+- Resolves: #232205: 'service {avahi-dnsconfd,avahi-daemon} status'
returns 0 when the service is stopped
* Fri Feb 2 2007 Christopher Aillon <cailloN at redhat.com> - 0.6.16-3
@@ -748,7 +792,7 @@ fi
- patches revision
* Mon Sep 18 2006 Martin Stransky <stransky at redhat.com> - 0.6.11-6
-- added patch from #206445 - ia64: unaligned access errors seen
+- added patch from #206445 - ia64: unaligned access errors seen
during startup of avahi-daemon
- removed unused patches
@@ -756,11 +800,11 @@ fi
- Maintain the security context on the localtime file
* Wed Aug 23 2006 Martin Stransky <stransky at redhat.com> - 0.6.11-4
-- fix for #204710 - /etc/init.d/avahi-dnsconfd missing line
+- fix for #204710 - /etc/init.d/avahi-dnsconfd missing line
continuation slash (\) in description
* Wed Aug 23 2006 Martin Stransky <stransky at redhat.com> - 0.6.11-3
-- added fix for #200767 - avahi-dnsconfd Segmentation fault
+- added fix for #200767 - avahi-dnsconfd Segmentation fault
with invalid command line argument
- added dist tag
@@ -802,7 +846,7 @@ fi
- Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir}
* Thu Mar 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-4
-- fix scriptlet error introduced by last fix:
+- fix scriptlet error introduced by last fix:
if user has disabled avahi-daemon, do not enable it during %post
* Wed Mar 08 2006 Bill Nottingham <notting at redhat.com> - 0.6.9-2
@@ -827,7 +871,7 @@ fi
* Fri Feb 10 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-3
- rebuild for new gcc (again)
-- further fix for bug 178746: fix avahi-dnsconfd initscript
+- further fix for bug 178746: fix avahi-dnsconfd initscript
* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-2
- rebuild for new gcc, glibc, glibc-kernheaders
@@ -843,7 +887,7 @@ fi
* Mon Jan 23 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.4-4
- fix bug 178689: copy localtime to chroot
-- fix bug 178784: fix avahi-dnsconfd initscript
+- fix bug 178784: fix avahi-dnsconfd initscript
* Fri Jan 20 2006 Peter Jones <pjones at redhat.com> - 0.6.4-3
- fix subsystem locking in the initscript
@@ -861,7 +905,7 @@ fi
* Mon Jan 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.3-1
- Upgrade to upstream version 0.6.3
- fix bug 177148: initscript start should not fail if avahi-daemon running
-
+
* Thu Dec 22 2005 Jason Vas Dias <jvdias at redhat.com> - 0.6.1-3
- move initscripts from /etc/init.d to /etc/rc.d/init.d
@@ -869,7 +913,7 @@ fi
- rebuilt
* Fri Dec 09 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6.1-2
-- fix bug 175352: Do not chkconfig --add avahi-daemon
+- fix bug 175352: Do not chkconfig --add avahi-daemon
if user has already configured it
* Wed Dec 07 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6.1-1
@@ -895,7 +939,7 @@ fi
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 14 Apr 2009 02:14:19 -0000 1.21
+++ sources 29 Jun 2010 02:33:04 -0000 1.22
@@ -1 +1 @@
-a83155a6e29e3988f07e5eea3287b21e avahi-0.6.25.tar.gz
+925438d4a6d6ebf65212ba1db75f25b5 avahi-0.6.26.tar.gz
More information about the scm-commits
mailing list