packages: avahi/avahi.spec - fix gtk+2/gtk+3 detection (patch) - missing in...

[lisu]

Author: lisu                         Date: Fri Jul  9 12:55:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix gtk+2/gtk+3 detection (patch)
- missing introspection file
- CVE reference
- rel 1

---- Files affected:
packages/avahi:
   avahi.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.115 packages/avahi/avahi.spec:1.116
--- packages/avahi/avahi.spec:1.115	Wed Jul  7 12:21:38 2010
+++ packages/avahi/avahi.spec	Fri Jul  9 14:55:34 2010
@@ -4,7 +4,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
@@ -33,7 +33,7 @@
 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
@@ -50,6 +50,7 @@
 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
@@ -597,6 +598,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__intltoolize}
@@ -813,26 +815,26 @@
 %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
@@ -973,7 +975,7 @@
 %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*
@@ -982,8 +984,8 @@
 %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
@@ -1011,11 +1013,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2010/07/09 12:55:34  lisu
+- fix gtk+2/gtk+3 detection (patch)
+- missing introspection file
+- CVE reference
+- rel 1
+
 Revision 1.115  2010/07/07 10:21:38  lisu
 - start update to 0.6.26
 - patches updated
 - add gtk3 bcond
 - more TODO
+[CVE-2010-2244]
 
 Revision 1.114  2010/06/11 11:43:28  jajcus
 - without gtk and without pygtk bconds for GUI-free builds
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.115&r2=1.116&f=u