rpms/empathy/F-9 .cvsignore, 1.13, 1.14 empathy.spec, 1.21, 1.22 sources, 1.13, 1.14

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sun May 4 00:42:48 UTC 2008 

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17613

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Sat May  3 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.1-1
- Update to new upstream release.
- Require telepathy-stream-engine for VOIP support (#444764)
- Drop multiple copies of COPYING file.
- Drop libtelepathy dependencies; upstream switched fully to telepathy-glib.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Apr 2008 02:05:41 -0000	1.13
+++ .cvsignore	4 May 2008 00:42:06 -0000	1.14
@@ -1 +1 @@
-empathy-0.22.1.tar.bz2
+empathy-0.23.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-9/empathy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- empathy.spec	12 Apr 2008 02:05:41 -0000	1.21
+++ empathy.spec	4 May 2008 00:42:06 -0000	1.22
@@ -1,16 +1,14 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?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.12
-%global	glib2_min_version	2.14
-%global	tp_mc_min_version	4.53
-%global	libtp_min_version	0.3.1
-%global	tp_glib_min_version	0.7.3		
+%global	glib2_min_version	2.15.5
+%global	tp_mc_min_version	4.61
+%global	tp_glib_min_version	0.7.6		
 
 Name:		empathy
-Version:	0.22.1
+Version:	0.23.1
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -27,16 +25,17 @@
 BuildRequires:	GConf2-devel 
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
+BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
 BuildRequires:	libglade2-devel
-BuildRequires:	libtelepathy-devel >= %{libtp_min_version}
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	pygtk2-devel	
-BuildRequires:	telepathy-glib >= %{tp_glib_min_version}
+BuildRequires:	pygtk2-devel
+BuildRequires:	scrollkeeper	
+BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 
 Requires:	%{name}-libs = %{version}-%{release}
@@ -49,6 +48,8 @@
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
+# Require this for VOIP support 
+Requires:	telepathy-stream-engine
 
 Requires(pre):	GConf2
 
@@ -72,6 +73,7 @@
 ## Needs these for the various #include directives in its headers, as well
 ## as pkgconfig dependencies...
 Requires:	glib2-devel >= %{glib2_min_version}
+Requires:	telepathy-glib-devel >= %{tp_glib_min_version}
 Requires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 Requires:	libxml2-devel
 
@@ -85,7 +87,7 @@
 Group:		Development/Libraries
 Requires:	glib2 >= %{glib2_min_version}
 Requires:	gtk2 >= %{gtk2_min_version}
-Requires:	libtelepathy >= %{libtp_min_version}
+Requires:	telepathy-glib >= %{tp_glib_min_version}
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
 %description	libs
@@ -108,7 +110,7 @@
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --with-compile-warnings=yes
+%configure --with-compile-warnings=yes  --disable-static
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 install -m 0644 %{SOURCE1} ./README.ConnectionManagers
 
@@ -116,13 +118,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 %find_lang %{name}
-## Remove --no-connect from the .desktop file; without this empathy won't
-## launch from the menu.
-sed -i 's/--no-connect//' %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
+
 desktop-file-install --vendor fedora --delete-original	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	%{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -177,9 +179,10 @@
 %{_bindir}/empathy
 %{_bindir}/empathy-accounts
 %{_bindir}/empathy-logs
-%{_datadir}/dbus-1/services/org.gnome.Empathy.Chat.service
 %{_datadir}/empathy/
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 ## Support for these are through Haze, and it (telepathy-haze-mission-control
 ## package) provides its own profiles with greater "out of the box"
@@ -192,29 +195,25 @@
 %{_datadir}/mission-control/profiles/ekiga.profile
 %{_datadir}/mission-control/profiles/fwd.profile
 %{_datadir}/mission-control/profiles/gtalk.profile
+%{_datadir}/mission-control/profiles/groupwise.profile
 %{_datadir}/mission-control/profiles/irc.profile
 %{_datadir}/mission-control/profiles/jabber.profile
 %{_datadir}/mission-control/profiles/msn.profile
 %{_datadir}/mission-control/profiles/salut.profile
 %{_datadir}/mission-control/profiles/sofiasip.profile
 %{_datadir}/mission-control/profiles/sipphone.profile
-%{_datadir}/telepathy/managers/empathy-chat.chandler
-%{_datadir}/telepathy/managers/empathy-call.chandler
 %{_libexecdir}/megaphone-applet
-%{_libexecdir}/empathy-call-chandler
+%{_libexecdir}/nothere-applet
 %{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_datadir}/dbus-1/services/org.gnome.Empathy.Call.service
+%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
 
 %files	libs
 %defattr(-,root,root,-)
-%doc COPYING
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*.a
 %{_libdir}/libempathy*.so.*
+%exclude %{_libdir}/*.a
 
 %files	devel
 %defattr(-,root,root,-)
-%doc COPYING
 %{_includedir}/libempathy*/
 %{_libdir}/libempathy*.so
 %{_libdir}/pkgconfig/libempathy*.pc
@@ -222,13 +221,16 @@
 
 %files	python
 %defattr(-,root,root,-)
-%doc COPYING
-%exclude %{python_sitearch}/*.a
-%exclude %{python_sitearch}/*.la
 %{python_sitearch}/empathy*.so
-
+%exclude %{python_sitearch}/*.a
 
 %changelog
+* Sat May  3 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.1-1
+- Update to new upstream release.
+- Require telepathy-stream-engine for VOIP support (#444764)
+- Drop multiple copies of COPYING file.
+- Drop libtelepathy dependencies; upstream switched fully to telepathy-glib.
+
 * Fri Apr 11 2008 Peter Gordon <peter at thecodergeek.com> - 0.22.1-1
 - Update to new upstream release (0.22.1)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Apr 2008 02:05:41 -0000	1.13
+++ sources	4 May 2008 00:42:06 -0000	1.14
@@ -1 +1 @@
-d8045104e4aff6559f81c13c37b22c9e  empathy-0.22.1.tar.bz2
+8ed7511804b1e0d77416843dc66d99c7  empathy-0.23.1.tar.bz2

More information about the fedora-extras-commits mailing list