From 51860451ec78fb2797d04c1054af99735d2d73ea Mon Sep 17 00:00:00 2001
From: lisu <lisu@pld-linux.org>
Date: Fri, 9 Jul 2010 12:55:34 +0000
Subject: [PATCH] - fix gtk+2/gtk+3 detection (patch) - missing introspection
 file - CVE reference - rel 1

Changed files:
    avahi.spec -> 1.116
---
 avahi.spec | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/avahi.spec b/avahi.spec
index 1f5358d..a0fe76c 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,7 +3,7 @@
 #	- finish with_apidocs
 #	- check BRs for gtk+3
 #	- make gtk3 bcond enabled by default when gtk+3 will be stable
-#	- files
+#	- introspection files
 #
 # Conditional build:
 %bcond_with	apidocs		# build API documentation
@@ -32,7 +32,7 @@ Summary:	Free mDNS/DNS-SD/Zeroconf implementation
 Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:		avahi
 Version:	0.6.26
-Release:	0.1
+Release:	1
 License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -49,6 +49,7 @@ Patch3:		%{name}-mono-dir.patch
 Patch4:		nss-mdns-package.patch
 Patch5:		%{name}-dhclient_hooks.patch
 Patch6:		%{name}-autoipd-sbin_ip.patch
+Patch7:		%{name}-gtk_detect.patch
 URL:		http://avahi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -596,6 +597,7 @@ Narzędzia linii poleceń korzystające z avahi-client.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__intltoolize}
@@ -812,26 +814,26 @@ fi
 %if %{with gtk}
 %files ui
 %defattr(644,root,root,755)
-#%%attr(755,root,root) %{_bindir}/bshell
-#%%attr(755,root,root) %{_bindir}/bssh
-#%%attr(755,root,root) %{_bindir}/bvnc
-#%%attr(755,root,root) %{_libdir}/libavahi-ui.so.*.*.*
-#%%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0
+%attr(755,root,root) %{_bindir}/bshell
+%attr(755,root,root) %{_bindir}/bssh
+%attr(755,root,root) %{_bindir}/bvnc
+%attr(755,root,root) %{_libdir}/libavahi-ui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0
 %{_mandir}/man1/bssh.1*
 %{_mandir}/man1/bvnc.1*
-#%%{_desktopdir}/bssh.desktop
-#%%{_desktopdir}/bvnc.desktop
+%{_desktopdir}/bssh.desktop
+%{_desktopdir}/bvnc.desktop
 
 %files ui-devel
 %defattr(644,root,root,755)
-#%%attr(755,root,root) %{_libdir}/libavahi-ui.so
-#%%{_libdir}/libavahi-ui.la
-#%%{_includedir}/avahi-ui
+%attr(755,root,root) %{_libdir}/libavahi-ui.so
+%{_libdir}/libavahi-ui.la
+%{_includedir}/avahi-ui
 %{_pkgconfigdir}/avahi-ui.pc
 
 %files ui-static
 %defattr(644,root,root,755)
-#%%{_libdir}/libavahi-ui.a
+%{_libdir}/libavahi-ui.a
 %endif
 
 %files compat-libdns_sd
@@ -972,7 +974,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-discover
 %{py_sitedir}/avahi_discover
-#%%{_datadir}/%{name}/interfaces/avahi-discover.glade
+%{_datadir}/%{name}/interfaces/avahi-discover.ui
 %{_desktopdir}/avahi-discover.desktop
 %{_pixmapsdir}/avahi.png
 %{_mandir}/man1/avahi-discover.1*
@@ -981,8 +983,8 @@ fi
 %if %{with gtk}
 %files discover-standalone
 %defattr(644,root,root,755)
-#%%attr(755,root,root) %{_bindir}/avahi-discover-standalone
-#%%{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade
+%attr(755,root,root) %{_bindir}/avahi-discover-standalone
+%{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade
 %endif
 
 %files utils
-- 
2.44.0