From: Baptiste DURAND Date: Fri, 7 Nov 2014 14:17:59 +0000 (+0100) Subject: Bump to 0.6.31 X-Git-Tag: accepted/tizen/3.0/ivi/20161028.151231^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46ef830da62a415aa6bbb0a175bbc88384f6d605;p=platform%2Fupstream%2Favahi.git Bump to 0.6.31 Signed-off-by: Baptiste DURAND --- diff --git a/packaging/01_avahi-daemon.conf.patch b/packaging/01_avahi-daemon.conf.patch new file mode 100644 index 0000000..d8cf45e --- /dev/null +++ b/packaging/01_avahi-daemon.conf.patch @@ -0,0 +1,16 @@ +Index: b/avahi-daemon/avahi-daemon.conf +=================================================================== +--- a/avahi-daemon/avahi-daemon.conf 2010-06-29 02:19:57.000000000 +0200 ++++ b/avahi-daemon/avahi-daemon.conf 2010-07-07 20:03:01.987655481 +0200 +@@ -21,9 +21,9 @@ + [server] + #host-name=foo + #domain-name=local +-browse-domains=0pointer.de, zeroconf.org ++#browse-domains=0pointer.de, zeroconf.org + use-ipv4=yes +-use-ipv6=no ++use-ipv6=yes + #allow-interfaces=eth0 + #deny-interfaces=eth1 + #check-response-ttl=no diff --git a/packaging/avahi-data.manifest b/packaging/avahi-data.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/avahi-data.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/avahi-devel.manifest b/packaging/avahi-devel.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/avahi-devel.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/avahi-libs.manifest b/packaging/avahi-libs.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/avahi-libs.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/avahi.changes b/packaging/avahi.changes new file mode 100644 index 0000000..ee3da27 --- /dev/null +++ b/packaging/avahi.changes @@ -0,0 +1,2 @@ +* Wed Jun 19 01:10:01 UTC 2013 - tracy.graydon@intel.com +- Fix dependendy on eglibc. diff --git a/packaging/avahi.manifest b/packaging/avahi.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/avahi.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/avahi.spec b/packaging/avahi.spec new file mode 100644 index 0000000..94324f5 --- /dev/null +++ b/packaging/avahi.spec @@ -0,0 +1,190 @@ +%define _unpackaged_files_terminate_build 0 +Name: avahi +Version: 0.6.31 +Release: 0 +Summary: Local network service discovery +Group: System/Network +License: LGPL-2.0 +Requires: dbus +Requires: expat +Requires(post): glibc +Requires: %{name}-libs = %{version}-%{release} +BuildRequires: automake libtool +BuildRequires: dbus-devel >= 0.90 +BuildRequires: dbus-glib-devel >= 0.70 +BuildRequires: libdaemon-devel +BuildRequires: libcap-devel +BuildRequires: expat-devel +BuildRequires: intltool +BuildRequires: perl-XML-Parser +Obsoletes: howl +Source0: %{name}-%{version}.tar.gz +Source1001: %{name}.manifest +Source1002: %{name}-libs.manifest +Source1003: %{name}-devel.manifest +Source1004: %{name}-data.manifest + +%description +Avahi is a system which facilitates service discovery on +a local network -- this means that you can plug your laptop or +computer into a network and instantly be able to view other people who +you can chat with, find printers to print to or find files being +shared. This kind of technology is already found in MacOS X (branded +'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very +convenient. + +%package libs +Summary: Libraries for avahi run-time use +Group: System/Libraries +Requires: poppler-tools + +%description libs +The avahi-libs package contains the libraries needed +to run programs that use avahi. + +%package devel +Summary: Libraries and header files for avahi development +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +The avahi-devel package contains the header files and libraries +necessary for developing programs using avahi. + +%package -n %{name}-data +Summary: Libraries for avahi run-time use +Group: System/Libraries +Requires: %{name} + +%description -n %{name}-data +The avahi-libs package contains the libraries needed +to run programs that use avahi. + +%prep +%setup -q +cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} . + +%build +%autogen --with-distro=fedora --with-avahi-user=avahi --with-avahi-group=avahi --with-avahi-priv-access-group=avahi \ + --disable-compat-libdns_sd \ + --disable-mono \ + --disable-manpages \ + --disable-monodoc \ + --disable-qt3 \ + --disable-qt4 \ + --disable-gtk \ + --disable-gtk3\ + --disable-python \ + --disable-pygtk \ + --disable-python-dbus \ + --disable-doxygen-doc\ + --disable-doxygen-dot\ + --disable-doxygen-xml\ + --disable-doxygen-html\ + --disable-doxygen-manpages\ + --disable-doxygen-xmltoman\ + --disable-glib \ + --disable-gobject \ + --disable-gdbm \ + --sysconfdir=%{_sysconfdir} \ + --localstatedir=%{_localstatedir} \ + --without-systemdsystemunitdir + +make %{?_smp_mflags} + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + +# remove example +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/services/sftp-ssh.service + +# create /var/run/avahi-daemon to ensure correct selinux policy for it: +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}-daemon + + +#mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}-autoipd + + +# Make /etc/avahi/etc/localtime owned by avahi: +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc +touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/localtime + + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +mkdir -p %{_localstatedir}/run/%{name}-daemon +#Evne eglibc is included in Requires(post), +#Not sure whether it's ok or not during making OBS image. +#That's why if statement is commented out to gurantee chown operation +#if [ ! -z "`getent group %{name}`" ]; then + chown -R %{name}:%{name} %{_localstatedir}/run/%{name}-daemon || true +#fi + + +%post libs +/sbin/ldconfig +%postun libs +/sbin/ldconfig + + +%files +%manifest %{name}.manifest +%defattr(0644,root,root,0755) +%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}-daemon +%attr(0755,root,root) %{_sbindir}/%{name}-daemon +%license LICENSE + +%files devel +%manifest %{name}-devel.manifest +%defattr(0644, root, root, 0755) +%attr(755,root,root) %{_libdir}/lib%{name}-common.so +%attr(755,root,root) %{_libdir}/lib%{name}-core.so +%attr(755,root,root) %{_libdir}/lib%{name}-client.so +%{_includedir}/%{name}-client +%{_includedir}/%{name}-common +%{_includedir}/%{name}-core +%{_libdir}/pkgconfig/%{name}-core.pc +%{_libdir}/pkgconfig/%{name}-client.pc +%attr(755,root,root) %{_bindir}/%{name}-browse +%attr(755,root,root) %{_bindir}/%{name}-browse-domains +%attr(755,root,root) %{_bindir}/%{name}-publish +%attr(755,root,root) %{_bindir}/%{name}-publish-address +%attr(755,root,root) %{_bindir}/%{name}-publish-service +%attr(755,root,root) %{_bindir}/%{name}-resolve +%attr(755,root,root) %{_bindir}/%{name}-resolve-address +%attr(755,root,root) %{_bindir}/%{name}-resolve-host-name +%attr(755,root,root) %{_bindir}/%{name}-set-host-name +%attr(755,root,root) %{_sbindir}/%{name}-autoipd + +%files libs +%manifest %{name}-libs.manifest +%defattr(0644, root, root, 0755) +%{_libdir}/%{name} +%exclude %{_libdir}/%{name}/service-types.db +%attr(0755,root,root) %{_libdir}/lib%{name}-common.so.* +%attr(0755,root,root) %{_libdir}/lib%{name}-client.so.* +%attr(0755,root,root) %{_libdir}/lib%{name}-core.so.* +%license LICENSE + +%files -n %{name}-data +%manifest %{name}-data.manifest +%defattr(0644,root,root,0755) +%exclude %dir %{_datadir}/%{name} +%exclude %{_datadir}/%{name}/*.dtd +%exclude %{_datadir}/%{name}/service-types +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/etc +%ghost %{_sysconfdir}/%{name}/etc/localtime +%config %{_sysconfdir}/%{name}/%{name}-daemon.conf +%license LICENSE