rpms/empathy/devel empathy.spec,1.22,1.23

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sun May 4 22:39:43 UTC 2008


Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29835

Modified Files:
	empathy.spec 
Log Message:
* Sun May  4 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.1-2
- Drop multiple copies of COPYING file.
- Drop BR on gnome-vfs2-devel.
- Require telepathy-stream-engine for VOIP support.
- Add BR on iso-codes-devel, so spell-checking is enabled.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- empathy.spec	25 Apr 2008 04:41:31 -0000	1.22
+++ empathy.spec	4 May 2008 22:39:03 -0000	1.23
@@ -1,4 +1,3 @@
-%{!?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,
@@ -10,7 +9,7 @@
 
 Name:		empathy
 Version:	0.23.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -21,6 +20,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	aspell-devel
+BuildRequires:	iso-codes-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	evolution-data-server-devel
 BuildRequires:	GConf2-devel 
@@ -28,7 +28,6 @@
 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:	libtool
@@ -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
 
@@ -109,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
 
@@ -117,7 +118,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 %find_lang %{name}
+
 desktop-file-install --vendor fedora --delete-original	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -205,14 +209,11 @@
 
 %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
@@ -220,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
+* Sun May  4 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.1-2
+- Drop multiple copies of COPYING file.
+- Drop BR on gnome-vfs2-devel.
+- Require telepathy-stream-engine for VOIP support.
+- Add BR on iso-codes-devel, so spell-checking is enabled.
+
 * Wed Apr 23 2008 Peter Gordon <peter at thecodergeek.com> - 0.23.1-1
 - Update to new upstream release (0.23.1)
 - Drop libtelepathy dependencies; upstream switched fully to telepathy-glib.




More information about the fedora-extras-commits mailing list