Automatic import for version 0.6.31-3

avahi.spec

@@ -18,6 +18,7 @@
 %define core_major 7
 %define dns_sd_major 1
 %define glib_major 1
+%define object_major 0
 %define gobject_major 0
 %define howl_major 0
 %define qt3_major 1
@@ -90,11 +91,10 @@
 Summary:	Avahi service discovery (mDNS/DNS-SD) suite
 Name:		avahi
 Version:	0.6.31
-Release: 2
+Release:	3
 License:	LGPLv2+
 Group:		System/Servers
 Url:		http://avahi.org/
-
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
 Source1:	avahi-hostname.sh
 
@@ -160,9 +160,12 @@ It includes avahi-discover-standalone.
 %package python
 Group:		System/Libraries
 Summary:	Python bindings and utilities for Avahi
-Requires: pygtk2.0-libglade python-twisted-core
-Requires: python-twisted-web dbus-python avahi 
-Requires: %{name}-x11
+Requires:	pygtk2.0-libglade
+Requires:	python-twisted-core
+Requires:	python-twisted-web
+Requires:	dbus-python
+Requires:	avahi = %{version}-%{release}
+Requires:	%{name}-x11 = %{version}-%{release}
 
 %description python
 Python bindings and utilities for Avahi.
@@ -172,7 +175,8 @@ It includes avahi-bookmarks and avahi-discover.
 %package sharp
 Group:		System/Libraries
 Summary:	Mono bindings for Avahi
-BuildRequires: mono-devel mono-tools
+BuildRequires:	mono-devel
+BuildRequires:	mono-tools
 #gw this is needed by mono-find-requires:
 BuildRequires:	avahi-ui-devel
 Requires:	%{lib_client_name} = %{version}-%{release}
@@ -250,7 +254,7 @@ Devel library for avahi-core.
 %package -n %{lib_dns_sd_name}
 Group:		System/Libraries
 Summary:	Avahi compatibility library for libdns_sd
-Obsoletes: %{lib_dns_sd_old_name}
+Obsoletes:	%{lib_dns_sd_old_name} < %{version}
 Provides:	%{lib_dns_sd_old_name}
 
 %description -n %{lib_dns_sd_name}
@@ -262,7 +266,7 @@ Summary: Avahi devel compatibility library for libdns_sd
 Provides:	%{dns_sd_name}-devel = %{version}-%{release}
 Provides:	lib%{dns_sd_name}-devel = %{version}-%{release}
 Requires:	%{lib_dns_sd_name} = %{version}-%{release}
-Obsoletes: %{lib_dns_sd_old_name}-devel
+Obsoletes:	%{lib_dns_sd_old_name}-devel < %{version}
 Provides:	%{lib_dns_sd_old_name}-devel
 Provides:	%{dns_sd_old_name}-devel = %{version}-%{release}
 Provides:	lib%{dns_sd_old_name}-devel = %{version}-%{release}
@@ -309,7 +313,7 @@ Devel library for avahi-gobject.
 %package -n %{lib_howl_name}
 Group:		System/Libraries
 Summary:	Avahi compatibility library for howl
-Obsoletes: %{lib_howl_old_name}
+Obsoletes:	%{lib_howl_old_name} < %{lib_howl_fake_EVR}
 Provides:	%{lib_howl_old_name} = %{lib_howl_fake_EVR}
 
 %description -n %{lib_howl_name}
@@ -321,7 +325,7 @@ Summary: Avahi devel compatibility library for libdns_sd for howl
 Provides:	%{howl_name}-devel = %{version}-%{release}
 Provides:	lib%{howl_name}-devel = %{version}-%{release}
 Requires:	%{lib_howl_name} = %{version}-%{release}
-Obsoletes: %{lib_howl_old_name}-devel
+Obsoletes:	%{lib_howl_old_name}-devel < %{lib_howl_fake_EVR}
 Provides:	%{lib_howl_old_name}-devel = %{lib_howl_fake_EVR}
 Provides:	%{howl_old_name}-devel = %{version}-%{release}
 Provides:	lib%{howl_old_name}-devel = %{version}-%{release}
@@ -373,6 +377,7 @@ Devel library for avahi-qt4.
 %package -n %{lib_ui_name}
 Group:		System/Libraries
 Summary:	Library for avahi-ui
+
 %description -n %{lib_ui_name}
 Library for avahi-ui.
 
@@ -428,7 +433,7 @@ export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig
 	--enable-compat-howl \
 	--enable-introspection=no \
 %if %{build_systemd}
-  --with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir=%{_unitdir} \
 %endif
 %if !%{build_gtk3}
 	--disable-gtk3
@@ -437,10 +442,11 @@ export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig
 %make
 
 %install
-rm -rf %{buildroot}
 %makeinstall_std
-rm -f %{buildroot}/%{_sysconfdir}/%{name}/services/ssh.service
+
+rm -f %{buildroot}%{_sysconfdir}/%{name}/services/ssh.service
 ln -s avahi-compat-howl.pc %{buildroot}%{_libdir}/pkgconfig/howl.pc
+
 %if "%{_lib}" != "lib" && %{build_mono}
 mkdir -p %{buildroot}%{_prefix}/lib
 mv %{buildroot}%{_libdir}/mono %{buildroot}%{_prefix}/lib
@@ -448,8 +454,13 @@ perl -pi -e "s/%{_lib}/lib/" %{buildroot}%{_libdir}/pkgconfig/avahi-{,ui-}sharp.
 %endif
 
 # install hostname.d hook
-mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/hostname.d/
-install -m755 avahi-hostname.sh %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/hostname.d/avahi
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/hostname.d/
+install -m755 avahi-hostname.sh %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/hostname.d/avahi
+
+%if %{build_systemd}
+rm -rf %{buildroot}%{_initrddir}/%{name}-daemon
+rm -rf %{buildroot}%{_initrddir}/%{name}-dnsconfd
+%endif
 
 %find_lang %{name}
 
@@ -491,7 +502,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/avahi-autoipd.action
 %config(noreplace) %{_sysconfdir}/%{name}/services/sftp-ssh.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/%{name}-dbus.conf
+%if !%{build_systemd}
 %{_initrddir}/%{name}-daemon
+%endif
 %{_sysconfdir}/sysconfig/network-scripts/hostname.d/avahi
 %{_bindir}/%{name}-browse
 %{_bindir}/%{name}-browse-domains
@@ -533,15 +546,17 @@ fi
 %dir %{_libdir}/avahi
 %{_libdir}/avahi/service-types.db
 %if %{build_systemd}
-/lib/systemd/system/avahi-daemon.service
-/lib/systemd/system/avahi-daemon.socket
-/lib/systemd/system/avahi-dnsconfd.service
+%{_unitdir}/avahi-daemon.service
+%{_unitdir}/avahi-daemon.socket
+%{_unitdir}/avahi-dnsconfd.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
 %endif
 
 %files dnsconfd
 %{_sysconfdir}/%{name}/%{name}-dnsconfd.action
+%if !%{build_systemd}
 %{_initrddir}/%{name}-dnsconfd
+%endif
 %{_sbindir}/%{name}-dnsconfd
 %{_mandir}/man8/%{name}-dnsconfd.8*
 %{_mandir}/man8/%{name}-dnsconfd.action.8*
@@ -683,8 +698,12 @@ fi
 %endif
 
 
-
 %changelog
+* Sun Sep 09 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 0.6.31-3
++ Revision: 816600
+- spec file clean
+- remove old initscripts when systemd support is enabled
+
 * Thu Feb 16 2012 Götz Waschk <waschk@mandriva.org> 0.6.31-2
 + Revision: 775266
 - reenable mono