update to 0.6.30

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4313 ec354946-7b23-47d6-9f5a-488ba84defc7

a/avahi/avahi-vl.spec

@@ -6,8 +6,8 @@
 Summary:        Local network service discovery 
 Summary(ja):	ローカルネットワークサービス検出システム
 Name:           avahi
-Version:        0.6.25
-Release: 	5%{?_dist_release}
+Version:        0.6.30
+Release: 	1%{?_dist_release}
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
@@ -15,12 +15,9 @@ URL:            http://avahi.org
 Source0:        %{name}-%{version}.tar.gz
 Patch10:	avahi-0.6.25-vine.patch
 
-# security fixes
-Patch110:	avahi-0.6.2x-CVE-2010-2244.patch
-Patch120:	avahi-0.6-CVE-2011-1002.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gtk2-devel, qt-devel, libglade2-devel, glib2-devel
+###BuildRequires:  gtk3-devel
 BuildRequires:  qt4-devel
 BuildRequires:  libdaemon-devel >= 0.12
 BuildRequires:  libcap-devel, dbus-devel, expat-devel
@@ -71,6 +68,15 @@ Requires: gtk2-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
+###%package ui-gtk3
+###Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+###Group: System Environment/Base
+###Requires: %{name} = %{version}-%{release}
+###Requires: gtk3
+
+###%description ui-gtk3
+###This library contains a Gtk 3.x widget for browsing services.
+
 %package glib
 Summary: Glib libraries for avahi
 Summary(ja): avahi 用 glib ライブラリ
@@ -204,6 +210,16 @@ Requires: compat32-gtk2-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
+###%package -n compat32-%{name}-ui-gtk3
+###Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+###Group: System Environment/Base
+###Requires: %{name}-ui-gtk3 = %{version}-%{release}
+###Requires: compat32-%{name} = %{version}-%{release}
+###Requires: compat32-gtk3
+
+###%description -n compat32-%{name}-ui-gtk3
+###This library contains a Gtk 3.x widget for browsing services.
+
 %package -n compat32-%{name}-glib
 Summary: Glib libraries for avahi
 Summary(ja): avahi 用 glib ライブラリ
@@ -312,22 +328,20 @@ necessary for developing programs using avahi.
 %setup -q
 %patch10 -p1 -b .vine
 
-# security fixes
-%patch110 -p1 -b .CVE-2010-2244
-%patch120 -p1 -b .CVE-2011-1002
-
-
 %build
 autoreconf -i
 
-%configure --with-distro=vine \
+%configure \
+  --disable-gtk3 \
+  --with-distro=vine \
   --disable-monodoc --without-python-twisted \
   --with-avahi-user=avahi --with-avahi-group=avahi \
   --enable-compat-howl --enable-compat-libdns_sd \
   --with-avahi-priv-access-group=avahi \
   --with-autoipd-user=avahi-autoipd \
   --with-autoipd-group=avahi-autoipd \
-  --disable-mono
+  --disable-mono \
+  --enable-introspection=no
 
 %__make -C avahi-python clean
 %__make %{?_smp_mflags}
@@ -424,7 +438,6 @@ fi
 
 %postun gobject -p /sbin/ldconfig
 
-# compat32
 %post -n compat32-%{name} -p /sbin/ldconfig
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
@@ -472,6 +485,7 @@ fi
 %attr(755,root,root) %{_libdir}/libdns_sd.so.*
 %attr(755,root,root) %{_datadir}/avahi
 %{_datadir}/locale/*
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_libdir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %{_mandir}/man5/*
@@ -509,8 +523,14 @@ fi
 %files ui-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-ui.so
+###%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
 %{_includedir}/avahi-ui
 %{_libdir}/pkgconfig/avahi-ui.pc
+###%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+
+###%files ui-gtk3
+###%defattr(0755, root, root, 0755)
+###%{_libdir}/libavahi-ui-gtk3.so.*
 
 %files glib
 %defattr(0755, root, root, 0755)
@@ -582,7 +602,13 @@ fi
 %files -n compat32-%{name}-ui-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-ui.so
+###%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
 %{_libdir}/pkgconfig/avahi-ui.pc
+###%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+
+###%files -n compat32-%{name}-ui-gtk3
+###%defattr(0755, root, root, 0755)
+###%{_libdir}/libavahi-ui-gtk3.so.*
 
 %files -n compat32-%{name}-glib
 %defattr(0755, root, root, 0755)
@@ -622,6 +648,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.30-1
+- new upstream release
+
 * Tue Apr 26 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.6.25-5
 - add patch120 for fix CVE-2011-1002 (incorrect fix CVE-2010-2244)
 - add patch110 for fix CVE-2010-2244 (DNS packets)