Merge tag 'upstream/0.8' into tizen

Change-Id: I00852b9745a16be9c24a7711cbfd00831f45849e

diff --cc packaging/avahi.spec
index c85bab9,0000000..6f7a860
mode 100644,000000..100644
--- 1/packaging/avahi.spec
--- /dev/null
+++ b/packaging/avahi.spec
@@@ -1,247 -1,0 +1,249 @@@
- Version:        0.7.0
 +%define _unpackaged_files_terminate_build 0
 +Name:           avahi
++Version:        0.8
 +Release:        0
 +License:        LGPL-2.1
 +Summary:        Local network service discovery
 +Url:            http://www.avahi.org/
 +Group:          Network & Connectivity
 +BuildRequires:  pkgconfig(dbus-1)
 +BuildRequires:  pkgconfig(glib-2.0)
 +BuildRequires:  pkgconfig(gio-2.0)
 +BuildRequires:  pkgconfig(expat)
 +BuildRequires:  pkgconfig(libdaemon)
 +
 +BuildRequires:  intltool
 +BuildRequires:  perl
 +#BuildRequires:  perl-XML-Parser
 +BuildRequires:  intltool
 +Source0:        %{name}-%{version}.tar.gz
 +Source1001:     %{name}.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
 +
 +%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}-dnsconfd
 +Summary:   Unicast DNS server from mDNS/DNS-SD configuration daemon 
 +Group:    System/Libraries
 +Requires: %{name}
 +
 +%description -n %{name}-dnsconfd
 +avahi-dnsconfd connects to a running avahi-daemon and runs the script
 +/etc/avahi/dnsconfd.action for each unicast DNS server that is
 +announced on the local LAN. This is useful for configuring unicast
 +DNS servers in a DHCP-like fashion with mDNS.
 + 
 +%package -n %{name}-autoipd
 +Summary:  IPv4LL network address configuration daemon 
 +Group:    System/Libraries
 +Requires: %{name}
 +
 +%description -n %{name}-autoipd
 +vahi-autoipd implements IPv4LL,
 +"Dynamic Configuration of IPv4 Link-Local Addresses" (IETF RFC3927),
 +a protocol for automatic IP address configuration from the link-local
 +169.254.0.0/16 range without the need for a central server. It is
 +primarily intended to be used in ad-hoc networks which lack a DHCP server. 
 +
 +%package -n %{name}-tests
 +Summary:  Executables for avahi
 +Group:    System/Libraries
 +Requires: %{name}
 +
 +%description -n %{name}-tests
 +The avahi-tests package contains the executables needed
 +to test avahi functionality.
 +
 +%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} .
 +
 +%build
 +
 +%configure \
 +            --with-distro=none \
 +            --with-avahi-user=root \
 +            --with-avahi-group=root \
 +            --with-avahi-priv-access-group=root \
 +            --disable-gobject \
 +            --disable-qt3 \
 +            --disable-qt4 \
++            --disable-qt5 \
 +            --disable-gtk \
 +            --disable-gtk3\
 +            --disable-gdbm \
 +            --disable-python \
 +            --disable-pygobject \
 +            --disable-python-dbus \
++                      --disable-libevent \
 +            --disable-mono \
 +            --disable-monodoc \
 +            --disable-pygtk \
 +            --disable-doxygen-doc \
 +            --disable-doxygen-dot \
 +            --disable-doxygen-man \
 +            --disable-doxygen-xml \
 +            --disable-doxygen-html \
 +            --disable-manpages \
 +            --disable-xmltoman \
 +            --disable-compat-libdns_sd \
 +            --disable-compat-howl \
 +            --with-dbus-sys=%{_sysconfdir}/dbus-1/system.d \
 +            --with-avahi-user=root \
 +            --with-avahi-group=root \
 +            --with-avahi-priv-access-group=root \
 +            --with-autoipd-user=root \
 +            --with-autoipd-group=root \
 +            --sysconfdir=%{_sysconfdir}  \
 +            --localstatedir=%{_localstatedir} \
 +            --with-dbus-sys=%{_sysconfdir}/dbus-1/system.d \
 +            --with-systemdsystemunitdir=%{_unitdir}
 +
 +make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +
 +# 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
 +%license LICENSE
 +%manifest %{name}.manifest
 +%defattr(0644,root,root,0755)
 +%config %{_sysconfdir}/%{name}/%{name}-daemon.conf
 +%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}-daemon
 +%attr(755,root,root) %{_sbindir}/%{name}-daemon
 +
 +%attr(755,root,root) %{_sysconfdir}/%{name}/hosts
 +%attr(755,root,root) %{_sysconfdir}/%{name}/etc/localtime
 +%attr(755,root,root) %{_sysconfdir}/%{name}/services/ssh.service
 +%attr(644,root,root) %{_datadir}/%{name}/%{name}-service.dtd
 +
 +%attr(644,-,-) %{_sysconfdir}/dbus-1/system.d/*
 +
 +#DBUS DAC
 +%attr(644,-,-) %{_datadir}/dbus-1/system-services/*
 +%attr(644,-,-) %{_libdir}/systemd/system/%{name}-daemon.service
 +%attr(644,-,-) %{_libdir}/systemd/system/%{name}-daemon.socket
 +
 +%files devel
 +%defattr(0644, root, root, 0755)
 +%attr(755,root,root) %{_libdir}/lib%{name}-glib.so
 +%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}-glib
 +%{_includedir}/%{name}-client
 +%{_includedir}/%{name}-common
 +%{_includedir}/%{name}-core
 +%{_libdir}/pkgconfig/%{name}-core.pc
 +%{_libdir}/pkgconfig/%{name}-client.pc
 +%{_libdir}/pkgconfig/%{name}-glib.pc
 +
 +%files libs
 +%license LICENSE
 +%defattr(0644, root, root, 0755)
 +%attr(0755,root,root) %{_libdir}/lib%{name}-glib.so.*
 +%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.*
 +
 +%files -n %{name}-dnsconfd
 +%license LICENSE
 +%defattr(0644,root,root,0755)
 +%attr(755,root,root) %{_sbindir}/%{name}-dnsconfd
 +%attr(644,root,root) %{_libdir}/systemd/system/%{name}-dnsconfd.service
 +%attr(755,root,root) %{_sysconfdir}/%{name}/%{name}-dnsconfd.action
 +
 +%files -n %{name}-autoipd
 +%license LICENSE
 +%defattr(0644,root,root,0755)
 +%attr(755,root,root) %{_sbindir}/%{name}-autoipd
 +%attr(755,root,root) %{_sysconfdir}/%{name}/%{name}-autoipd.action
 +
 +%files -n %{name}-tests
 +%license LICENSE
 +%defattr(0644,root,root,0755)
 +%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
 +
 +%files -n %{name}-data
 +%license LICENSE
 +%defattr(0644,root,root,0755)
 +%attr(644,-,-) %{_datadir}/locale/*