avahi-0.7-2

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

a/avahi/avahi-vl.spec

@@ -6,7 +6,7 @@ Summary:        Local network service discovery
 Summary(ja):	ローカルネットワークサービス検出システム
 Name:           avahi
 Version:        0.7
-Release:		1%{?_dist_release}
+Release:		2%{?_dist_release}
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
@@ -17,12 +17,11 @@ Patch0:			avahi-0.6.31-no-deprecations.patch
 Patch10:		avahi-0.6.31-vine.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:  gtk2-devel, qt-devel, libglade2-devel, glib2-devel
+BuildRequires:  glib2-devel
 BuildRequires:  gtk3-devel, gobject-introspection-devel
-BuildRequires:  qt4-devel
 BuildRequires:  libdaemon-devel >= 0.12
 BuildRequires:  libcap-devel, dbus-devel, expat-devel
-BuildRequires:  python, dbus-python, gdbm-devel, pygtk2, libmng-devel
+BuildRequires:  python, dbus-python, gdbm-devel, libmng-devel
 BuildRequires:  xorg-x11-devel, mesa-libGL-devel
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig >= 1.3.34
@@ -43,42 +42,35 @@ convenient.
 %package tools
 Summary: Tools for mDNS browsing and publishing
 Group: System Environment/Base
-Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade, gdbm
+Requires: %{name} = %{version}, gdbm
 
 %description tools
 Tools that use avahi to browse and publish mDNS services and hosts.
 
-%package ui
-Summary: UI libraries for avahi
-Summary(ja): avahi 用 UI ライブラリ
-Group: System Environment/Libraries
-Requires: %{name} = %{version}
-Requires: gtk2
+%package ui-gtk3
+Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+Group: System Environment/Base
+Provides: avahi-ui = %{version}-%{release}
+Obsoletes: avahi-ui < %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: gtk3
 
-%description ui
-Libraries for easy use of avahi from gtk applications.
+%description ui-gtk3
+This library contains a Gtk 3.x widget for browsing services.
 
-%package ui-devel
+%package ui-gtk3-devel
 Summary: Libraries and header files for avahi ui development
 Group: Development/Libraries
+Provides: avahi-ui-devel = %{version}-%{release}
+Obsoletes: avahi-ui-devel < %{version}-%{release}
 Requires: %{name}-devel = %{version}
-Requires: %{name}-ui = %{version}
 Requires: %{name}-ui-gtk3 = %{version}
-Requires: gtk2-devel
+Requires: gtk3-devel
 
-%description ui-devel
+%description ui-gtk3-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 ライブラリ
@@ -122,47 +114,6 @@ Requires: %{name}-glib-devel = %{version}-%{release}
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
-%package qt3
-Summary: Qt3 libraries for avahi
-Summary(ja): avahi 用 Qt3 ライブラリ
-Group: System Environment/Libraries
-Requires: %{name} = %{version}
-Requires: qt
-
-%description qt3
-Libraries for easy use of avahi from Qt3 applications.
-
-%package qt3-devel
-Summary: Libraries and header files for avahi Qt3 development
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}
-Requires: %{name}-qt3 = %{version}
-Requires: qt-devel
-
-%description qt3-devel
-The avahi-qt3-devel package contains the header files and libraries
-necessary for developing programs using avahi with Qt3.
-
-%package qt4
-Summary: Qt4 libraries for avahi
-Summary(ja): avahi 用 Qt4 ライブラリ
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
-
-%description qt4
-Libraries for easy use of avahi from Qt4 applications.
-
-%package qt4-devel
-Summary: Libraries and header files for avahi Qt4 development
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-qt4 = %{version}-%{release}
-Requires: qt4-devel
-
-%description qt4-devel
-Th avahi-qt4-devel package contains the header files and libraries
-necessary for developing programs using avahi with Qt4.
-
 %package devel
 Summary: Libraries and header files for avahi development
 Group: Development/Libraries
@@ -189,39 +140,32 @@ shared. This kind of technology is already found in MacOS X (branded
 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very
 convenient.
 
-%package -n compat32-%{name}-ui
-Summary: UI libraries for avahi
-Summary(ja): avahi 用 UI ライブラリ
-Group: System Environment/Libraries
-Requires: %{name}-ui = %{version}-%{release}
+%package -n compat32-%{name}-ui-gtk3
+Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+Group: System Environment/Base
+Provides: compat32-avahi-ui = %{version}-%{release}
+Obsoletes: compat32-avahi-ui < %{version}-%{release}
+Requires: %{name}-ui-gtk3 = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
-Requires: compat32-gtk2
+Requires: compat32-gtk3
 
-%description -n compat32-%{name}-ui
-Libraries for easy use of avahi from gtk applications.
+%description -n compat32-%{name}-ui-gtk3
+This library contains a Gtk 3.x widget for browsing services.
 
-%package -n compat32-%{name}-ui-devel
+%package -n compat32-%{name}-ui-gtk3-devel
 Summary: Libraries and header files for avahi ui development
 Group: Development/Libraries
+Provides: compat32-avahi-ui-devel = %{version}-%{release}
+Obsoletes: compat32-avahi-ui-devel < %{version}-%{release}
 Requires: %{name}-ui-devel = %{version}-%{release}
 Requires: compat32-%{name}-devel = %{version}-%{release}
-Requires: compat32-%{name}-ui = %{version}-%{release}
-Requires: compat32-gtk2-devel
+Requires: compat32-%{name}-ui-gtk3 = %{version}-%{release}
+Requires: compat32-gtk3-devel
 
-%description -n compat32-%{name}-ui-devel
+%description -n compat32-%{name}-ui-gtk3-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 ライブラリ
@@ -269,51 +213,6 @@ Requires: compat32-%{name}-glib-devel = %{version}-%{release}
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
-%package -n compat32-%{name}-qt3
-Summary: Qt3 libraries for avahi
-Summary(ja): avahi 用 Qt3 ライブラリ
-Group: System Environment/Libraries
-Requires: %{name}-qt3 = %{version}-%{release}
-Requires: compat32-%{name} = %{version}-%{release}
-Requires: compat32-qt
-
-%description -n compat32-%{name}-qt3
-Libraries for easy use of avahi from Qt3 applications.
-
-%package -n compat32-%{name}-qt3-devel
-Summary: Libraries and header files for avahi Qt3 development
-Group: Development/Libraries
-Requires: %{name}-qt3-devel = %{version}-%{release}
-Requires: compat32-%{name}-devel = %{version}-%{release}
-Requires: compat32-%{name}-qt3 = %{version}-%{release}
-Requires: compat32-qt-devel
-
-%description -n compat32-%{name}-qt3-devel
-The avahi-qt3-devel package contains the header files and libraries
-necessary for developing programs using avahi with Qt3.
-
-%package -n compat32-%{name}-qt4
-Summary: Qt4 libraries for avahi
-Summary(ja): avahi 用 Qt4 ライブラリ
-Group: System Environment/Base
-Requires: %{name}-qt4 = %{version}-%{release}
-Requires: compat32-%{name} = %{version}-%{release}
-
-%description -n compat32-%{name}-qt4
-Libraries for easy use of avahi from Qt4 applications.
-
-%package -n compat32-%{name}-qt4-devel
-Summary: Libraries and header files for avahi Qt4 development
-Group: Development/Libraries
-Requires: %{name}-qt4-devel = %{version}-%{release}
-Requires: compat32-%{name}-devel = %{version}-%{release}
-Requires: compat32-%{name}-qt4 = %{version}-%{release}
-Requires: compat32-qt4-devel
-
-%description -n compat32-%{name}-qt4-devel
-Th avahi-qt4-devel package contains the header files and libraries
-necessary for developing programs using avahi with Qt4.
-
 %package -n compat32-%{name}-devel
 Summary: Libraries and header files for avahi development
 Group: Development/Libraries
@@ -343,6 +242,10 @@ autoreconf -i
   --with-avahi-priv-access-group=avahi \
   --with-autoipd-user=avahi-autoipd \
   --with-autoipd-group=avahi-autoipd \
+  --enable-gtk3 \
+  --disable-gtk \
+  --disable-qt3 \
+  --disable-qt4 \
   --disable-mono \
   --enable-introspection=no
 
@@ -421,10 +324,6 @@ if [ "$1" -eq "0" ]; then
     /sbin/chkconfig --del avahi-dnsconfd
 fi
 
-%post ui -p /sbin/ldconfig
-
-%postun ui -p /sbin/ldconfig
-
 %post ui-gtk3 -p /sbin/ldconfig
 
 %postun ui-gtk3 -p /sbin/ldconfig
@@ -433,14 +332,6 @@ fi
 
 %postun glib -p /sbin/ldconfig
 
-%post qt3 -p /sbin/ldconfig
-
-%postun qt3 -p /sbin/ldconfig
-
-%post qt4 -p /sbin/ldconfig
-
-%postun qt4 -p /sbin/ldconfig
-
 %post gobject -p /sbin/ldconfig
 
 %postun gobject -p /sbin/ldconfig
@@ -449,10 +340,6 @@ fi
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
-%post -n compat32-%{name}-ui -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-ui -p /sbin/ldconfig
-
 %post -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
 
 %postun -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
@@ -461,14 +348,6 @@ fi
 
 %postun -n compat32-%{name}-glib -p /sbin/ldconfig
 
-%post -n compat32-%{name}-qt3 -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-qt3 -p /sbin/ldconfig
-
-%post -n compat32-%{name}-qt4 -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-qt4 -p /sbin/ldconfig
-
 %post -n compat32-%{name}-gobject -p /sbin/ldconfig
 
 %postun -n compat32-%{name}-gobject -p /sbin/ldconfig
@@ -527,22 +406,16 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
-%files ui
+%files ui-gtk3
 %defattr(-, root, root)
-%{_libdir}/libavahi-ui.so.*
+%{_libdir}/libavahi-ui-gtk3.so.*
 
-%files ui-devel
+%files ui-gtk3-devel
 %defattr(-, root, root)
-%{_libdir}/libavahi-ui.so
 %{_libdir}/libavahi-ui-gtk3.so
 %{_includedir}/avahi-ui
-%{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
-%files ui-gtk3
-%defattr(-, root, root)
-%{_libdir}/libavahi-ui-gtk3.so.*
-
 %files glib
 %defattr(-, root, root)
 %{_libdir}/libavahi-glib.so.*
@@ -563,26 +436,6 @@ fi
 %{_includedir}/avahi-gobject
 %{_libdir}/pkgconfig/avahi-gobject.pc
 
-%files qt3
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so.*
-
-%files qt3-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so
-%{_includedir}/avahi-qt3
-%{_libdir}/pkgconfig/avahi-qt3.pc
-
-%files qt4
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt4.so.*
-
-%files qt4-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt4.so
-%{_includedir}/avahi-qt4/
-%{_libdir}/pkgconfig/avahi-qt4.pc
-
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -606,21 +459,15 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
-%files -n compat32-%{name}-ui
+%files -n compat32-%{name}-ui-gtk3
 %defattr(-, root, root)
-%{_libdir}/libavahi-ui.so.*
+%{_libdir}/libavahi-ui-gtk3.so.*
 
-%files -n compat32-%{name}-ui-devel
+%files -n compat32-%{name}-ui-gtk3-devel
 %defattr(-, root, root)
-%{_libdir}/libavahi-ui.so
 %{_libdir}/libavahi-ui-gtk3.so
-%{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
-%files -n compat32-%{name}-ui-gtk3
-%defattr(-, root, root)
-%{_libdir}/libavahi-ui-gtk3.so.*
-
 %files -n compat32-%{name}-glib
 %defattr(-, root, root)
 %{_libdir}/libavahi-glib.so.*
@@ -638,27 +485,13 @@ fi
 %defattr(-, root, root)
 %{_libdir}/libavahi-gobject.so
 %{_libdir}/pkgconfig/avahi-gobject.pc
-
-%files -n compat32-%{name}-qt3
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so.*
-
-%files -n compat32-%{name}-qt3-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt3.so
-%{_libdir}/pkgconfig/avahi-qt3.pc
-
-%files -n compat32-%{name}-qt4
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt4.so.*
-
-%files -n compat32-%{name}-qt4-devel
-%defattr(-, root, root)
-%{_libdir}/libavahi-qt4.so
-%{_libdir}/pkgconfig/avahi-qt4.pc
 %endif
 
 %changelog
+* Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7-2
+- rebuilt with gdbm-1.18.1.
+- dropped GTK+2, Qt3 and Qt4 support.
+
 * Tue Feb 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7-1
 - new upstream release.
 - fixed illegal %%attr.