empathy-2.30.0.1-1

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

e/empathy/empathy-vl.spec

@@ -1,11 +1,15 @@
+%define major_ver 2.30
+%define minor_ver 0.1
+%define rel       1
+
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 ## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
 ## respectively.
 %global	gtk2_min_version	2.14
-%global	glib2_min_version	2.18.0
+%global	glib2_min_version	2.22.0
 %global	tp_mc_min_version	5.3.2
-%global	tp_glib_min_version	0.7.35
+%global	tp_glib_min_version	0.9.2
 #global	enchant_version		1.4.0
 %global	aspell_version		0.50
 %global libcanberra_version	0.4
@@ -16,14 +20,14 @@ Summary:	GNOME Instant Messaging Client
 Summary(ja):	GNOME インスタントメッセージクラアイント
 
 Name:		empathy
-Version:	2.28.2
+Version:	%{major_ver}.%{minor_ver}
-Release:        1%{?_dist_release}
+Release:        %{rel}%{?_dist_release}
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{majorver}/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -48,15 +52,13 @@ BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:  farsight2-devel
 BuildRequires:	telepathy-farsight-devel 
 BuildRequires:	libcanberra-devel >= %{libcanberra_version}
-BuildRequires:	gnome-keyring-devel >= %{gnome_keyring_version}
+BuildRequires:	libgnome-keyring-devel >= %{gnome_keyring_version}
 BuildRequires:	unique-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	libtelepathy-devel
 BuildRequires:	libgnomecanvas-devel
 BuildRequires:	libbonoboui-devel
-BuildRequires:	python-devel
 
-Requires:	%{name}-libs = %{version}-%{release}
 Requires:	telepathy-filesystem
 ## Empathy is useless without a proper Telepathy connection manager installed.
 ## We hardcode dependencies on Salut and Gabble to support XMPP on a default
@@ -85,53 +87,17 @@ Requires(postun):	scrollkeeper
 ## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
 Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
 Provides:	telepathy-haze-mission-control = 0.2.0-3
+## upstream 2.29.1 removed shared libraries: #599086
+Obsoletes: empathy-libs < 2.29.1, empathy-devel < 2.29.1
+## upstream 2.29.1 removed python bindings' #599039
+# comment out: don't provides current empathy
+#Obsoletes: empathy-python < 2.29.1
 
 %description
 Empathy provides a powerful multiple protocol instant messaging
 client using the Telepathy framework.
 
 
-%package	devel
-Summary:	Development files for %{name}
-Summary(ja):	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
-## Needs these for the various #include directives in its headers, as well
-## as pkgconfig dependencies...
-Requires:	glib2-devel
-Requires:	telepathy-glib-devel
-Requires:	telepathy-mission-control-devel
-Requires:	libxml2-devel
-
-%description	devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-
-%package	libs
-Summary:	Shared libraries for %{name}
-Summary(ja):	Shared libraries for %{name}
-Group:		Development/Libraries
-Requires:	glib2
-Requires:	gtk2
-Requires:	telepathy-glib
-Requires:	telepathy-mission-control
-
-%description	libs
-The %{name}-libs package contains shared libraries used by Empathy.
-
-
-%package	python
-Summary:	Python bindings for libempathy and libempathy-gtk
-Summary(ja):	Python bindings for libempathy and libempathy-gtk
-Group:		Development/Languages
-Requires:	%{name}-libs = %{version}-%{release}	
-
-%description	python
-This package contains the empathy and empathygtk Python modules, which provide
-bindings to the libempathy and libempathy-gtk libraries, respectively.
-
 %prep
 %setup -q
 
@@ -171,28 +137,28 @@ rm -rf %{buildroot}
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
 
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+## for empathy =< 2.28.2-1's schemas
+if [ -e %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas ]; then
+	gconftool-2 --makefile-uninstall-rule	\
+		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas > /dev/null ||:
+fi
 gconftool-2 --makefile-install-rule	\
-	%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
-%post libs -p /sbin/ldconfig
-
 
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -204,16 +170,14 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%postun libs -p /sbin/ldconfig
-
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
-%{_bindir}/empathy-logs
+%{_bindir}/empathy-accounts
+%{_bindir}/empathy-debugger
 %{_datadir}/dbus-1/services/*
 %{_datadir}/empathy
 %{_datadir}/applications/*.desktop
@@ -222,28 +186,23 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 #{_datadir}/mission-control/profiles/*.profile
 %{_datadir}/telepathy/clients/Empathy.client
-%{_libexecdir}/megaphone-applet
+%{_mandir}/man1/empathy*.1*
-%{_libexecdir}/nothere-applet
-%{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
-%{_mandir}/man1/empathy*.1.gz
-
-%files	libs
-%defattr(-,root,root,-)
-%{_libdir}/libempathy*.so.*
 
-%files	devel
-%defattr(-,root,root,-)
-%{_includedir}/libempathy*/
-%{_libdir}/libempathy*.so
-%{_libdir}/pkgconfig/libempathy*.pc
-%{_datadir}/gtk-doc/html/libempathy*
-
-%files	python
-%defattr(-,root,root,-)
-%{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Apr 13 2010 IWAI, Masaharu <iwai@alib.jp> 2.30.0.1-1
+- new upstream release
+- add new files: %%{_bindir}/empathy-{accounts,debugger}
+- drop -libs, -devel, -python sub packages: upstream removed
+  - Obsoletes: empathy-{libs,devel} < 2.29.1
+  - drop BuildRequires: python-devel
+- drop %%{_bindir}/empathy-logs in %%files: upstream don not install
+- drop applet files in %%files: upstream removed the panel applets
+  - update %%post, %pre and %%preun
+- update BuildRequires version for glib2 and tp_glib
+- defined major_ver, minor_ver and rel
+- fix BuildRequires for gnome-keyring
+
 * Sat Mar 13 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.2-1
 - new upstream release
 - add BuildRequires: libtelepathy-devel, libgnomecanvas-devel, libbonoboui-devel, python-devel