rpms/empathy/devel .cvsignore, 1.17, 1.18 empathy.spec, 1.27, 1.28 sources, 1.17, 1.18

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Mon Aug 04 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.6-1
- Update to new upstream release (2.23.6)
- Use the in-tarball libtool scripts instead of the system copy to workaround
  'make install' errors.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Jul 2008 00:41:27 -0000	1.17
+++ .cvsignore	5 Aug 2008 02:16:53 -0000	1.18
@@ -1 +1 @@
-empathy-0.23.4.tar.bz2
+empathy-2.23.6.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- empathy.spec	17 Jul 2008 00:41:27 -0000	1.27
+++ empathy.spec	5 Aug 2008 02:16:53 -0000	1.28
@@ -9,7 +9,7 @@
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	0.23.4
+Version:	2.23.6
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -30,8 +30,8 @@
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
+BuildRequires:	intltool
 BuildRequires:	libglade2-devel
-BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	pygtk2-devel
@@ -112,7 +112,10 @@
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
 %configure --with-compile-warnings=yes --disable-static
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+## RPATHs are yucky.
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 install -m 0644 %{SOURCE1} ./README.ConnectionManagers
 
 
@@ -127,6 +130,10 @@
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
+desktop-file-install --vendor fedora --delete-original	\
+	--dir %{buildroot}%{_datadir}/applications	\
+	%{buildroot}%{_datadir}/applications/%{name}-properties.desktop
+
 
 %clean
 rm -rf %{buildroot}
@@ -178,10 +185,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
-%{_bindir}/empathy-accounts
 %{_bindir}/empathy-logs
 %{_datadir}/empathy/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/fedora-%{name}*.desktop
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
@@ -212,7 +218,6 @@
 %files	libs
 %defattr(-,root,root,-)
 %{_libdir}/libempathy*.so.*
-%exclude %{_libdir}/*.a
 
 %files	devel
 %defattr(-,root,root,-)
@@ -224,9 +229,13 @@
 %files	python
 %defattr(-,root,root,-)
 %{python_sitearch}/empathy*.so
-%exclude %{python_sitearch}/*.a
 
 %changelog
+* Mon Aug 04 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.6-1
+- Update to new upstream release (2.23.6)
+- Use the in-tarball libtool scripts instead of the system copy to workaround
+  'make install' errors.
+
 * Wed Jul 16 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.4-1
 - Update to 0.23.4.
 - Update source url.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Jul 2008 00:41:27 -0000	1.17
+++ sources	5 Aug 2008 02:16:53 -0000	1.18
@@ -1 +1 @@
-5a41033e3e41e9769628e0118f32d5c3  empathy-0.23.4.tar.bz2
+f579bb9806a0cc8639b6a6fa9421679d  empathy-2.23.6.tar.bz2