diff --git a/.cvsignore b/.cvsignore index cbc2a1a..ef0eefe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -empathy-2.28.1.1.tar.bz2 +empathy-2.29.2.tar.bz2 diff --git a/empathy-broken-nm.patch b/empathy-broken-nm.patch index f6ac514..61d5f91 100644 --- a/empathy-broken-nm.patch +++ b/empathy-broken-nm.patch @@ -1,7 +1,7 @@ -diff -urp empathy-2.28.0.OLD/configure empathy-2.28.0/configure ---- empathy-2.28.0.OLD/configure 2009-09-21 05:45:32.000000000 -0400 -+++ empathy-2.28.0/configure 2009-09-21 15:01:54.549375691 -0400 -@@ -15494,16 +15494,16 @@ if test -n "$PKG_CONFIG"; then +diff -urp empathy-2.29.2.orig/configure empathy-2.29.2/configure +--- empathy-2.29.2.orig/configure 2009-11-16 11:56:32.000000000 -0500 ++++ empathy-2.29.2/configure 2009-11-16 18:01:53.977910996 -0500 +@@ -15604,16 +15604,16 @@ if test -n "$PKG_CONFIG"; then else if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" @@ -21,7 +21,7 @@ diff -urp empathy-2.28.0.OLD/configure empathy-2.28.0/configure " 2>/dev/null` else pkg_failed=yes -@@ -15518,16 +15518,16 @@ if test -n "$PKG_CONFIG"; then +@@ -15628,16 +15628,16 @@ if test -n "$PKG_CONFIG"; then else if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" @@ -41,7 +41,7 @@ diff -urp empathy-2.28.0.OLD/configure empathy-2.28.0/configure " 2>/dev/null` else pkg_failed=yes -@@ -15548,11 +15548,11 @@ else +@@ -15658,11 +15658,11 @@ else fi if test $_pkg_short_errors_supported = yes; then NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " @@ -55,10 +55,10 @@ diff -urp empathy-2.28.0.OLD/configure empathy-2.28.0/configure "` fi # Put the nasty error message in config.log where it belongs -diff -urp empathy-2.28.0.OLD/configure.ac empathy-2.28.0/configure.ac ---- empathy-2.28.0.OLD/configure.ac 2009-09-14 16:39:15.000000000 -0400 -+++ empathy-2.28.0/configure.ac 2009-09-21 15:03:17.926637317 -0400 -@@ -183,7 +183,7 @@ else +diff -urp empathy-2.29.2.orig/configure.ac empathy-2.29.2/configure.ac +--- empathy-2.29.2.orig/configure.ac 2009-11-16 11:55:52.000000000 -0500 ++++ empathy-2.29.2/configure.ac 2009-11-16 18:03:24.609913005 -0500 +@@ -227,7 +227,7 @@ else PKG_CHECK_MODULES(NETWORK_MANAGER, [ diff --git a/empathy-broken-pkgconfig.patch b/empathy-broken-pkgconfig.patch deleted file mode 100644 index 1401336..0000000 --- a/empathy-broken-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urp empathy-2.27.92.OLD/libempathy/libempathy.pc.in empathy-2.27.92/libempathy/libempathy.pc.in ---- empathy-2.27.92.OLD/libempathy/libempathy.pc.in 2009-09-01 04:57:31.000000000 -0400 -+++ empathy-2.27.92/libempathy/libempathy.pc.in 2009-09-08 12:55:21.078269583 -0400 -@@ -5,8 +5,7 @@ includedir=@includedir@ - - Name: libempathy - Description: Empathy base library --Requires: pkg-config >= 0.21 --Requires.private: glib-2.0, gobject-2.0, libxml-2.0, \ -+Requires: glib-2.0, gobject-2.0, libxml-2.0, \ - gio-2.0, gio-unix-2.0, telepathy-glib - Version: @VERSION@ - Libs: -L${libdir} -lempathy -diff -urp empathy-2.27.92.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.92/libempathy-gtk/libempathy-gtk.pc.in ---- empathy-2.27.92.OLD/libempathy-gtk/libempathy-gtk.pc.in 2009-09-01 04:57:31.000000000 -0400 -+++ empathy-2.27.92/libempathy-gtk/libempathy-gtk.pc.in 2009-09-08 12:55:40.418269081 -0400 -@@ -5,8 +5,7 @@ includedir=@includedir@ - - Name: libempathy-gtk - Description: Empathy interface library --Requires: pkg-config >= 0.21 --Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, \ -+Requires: glib-2.0, gobject-2.0, gtk+-2.0, \ - libempathy, telepathy-glib, libcanberra-gtk - Version: @VERSION@ - Libs: -L${libdir} -lempathy-gtk diff --git a/empathy.spec b/empathy.spec index 058ee05..279f3ee 100644 --- a/empathy.spec +++ b/empathy.spec @@ -1,10 +1,8 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - ## Minimum required versions. -%global gtk2_min_version 2.16 -%global glib2_min_version 2.16.0 +%global gtk2_min_version 2.18 +%global glib2_min_version 2.22.0 %global tp_mc_min_version 5.0.0 -%global tp_glib_min_version 0.7.35 +%global tp_glib_min_version 0.9.0 %global enchant_version 1.2.0 %global network_manager_version 0.7.0 %global libcanberra_version 0.4 @@ -13,26 +11,20 @@ %global libchamplain_version 0.4 Name: empathy -Version: 2.28.1.1 -Release: 2%{?dist} +Version: 2.29.2 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications License: GPLv2+ URL: http://live.gnome.org/Empathy -Source0: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 Source1: %{name}-README.ConnectionManagers -## Workaround for our broken pkgconfig -## https://bugzilla.redhat.com/show_bug.cgi?id=436773 -## http://bugzilla.gnome.org/show_bug.cgi?id=577863 -## Removes old mission-control lookup -## http://bugzilla.gnome.org/show_bug.cgi?id=593224 -Patch1: %{name}-broken-pkgconfig.patch # http://bugzilla.gnome.org/show_bug.cgi?id=592853 -Patch3: presence-icons.patch -Patch5: %{name}-broken-nm.patch +Patch1: presence-icons.patch +Patch2: %{name}-broken-nm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +41,6 @@ BuildRequires: webkitgtk-devel >= %{webkit_version} BuildRequires: gtk2-devel >= %{gtk2_min_version} BuildRequires: intltool BuildRequires: libxml2-devel -BuildRequires: pygtk2-devel BuildRequires: scrollkeeper BuildRequires: telepathy-glib-devel >= %{tp_glib_min_version} BuildRequires: telepathy-farsight-devel @@ -61,82 +52,43 @@ BuildRequires: clutter-gtk-devel BuildRequires: geoclue-devel >= 0.11 BuildRequires: unique-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 -## install, in both the link-local and Jabber/GoogleTalk incarnations. -## (RHBZ: 308871 and 334221) -## TODO: Perhaps we can configure these to be installed "on demand" with -## PackageKit and friends? +Requires: telepathy-mission-control >= %{tp_mc_min_version} +## We install the following connection managers by default. Requires: telepathy-gabble Requires: telepathy-salut Requires: telepathy-idle Requires: telepathy-butterfly -## Also hardcode Haze dependency since Empathy is the default IM client in F12(RHBZ: 458935) Requires: telepathy-haze -Requires: telepathy-mission-control >= %{tp_mc_min_version} Requires(pre): GConf2 - Requires(post): GConf2 Requires(post): scrollkeeper - Requires(preun): GConf2 - Requires(postun): scrollkeeper ## Profiles are no longer used, so we can drop this around F14. Obsoletes: telepathy-haze-mission-control < 0.2.0-3 Provides: telepathy-haze-mission-control = 0.2.0-3 +## Devel, libs, and python subpackages have been removed. These can be dropped around F15. +Obsoletes: %{name}-devel < 2.29.2-1 +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: %{name}-libs < 2.29.2-1 +Provides: %{name}-libs = %{version}-%{release} +Obsoletes: %{name}-python < 2.29.2-1 +Provides: %{name}-python = %{version}-%{release} + %description Empathy is powerful multi-protocol instant messaging client which supports Jabber, GTalk, MSN, IRC, Salut, and other protocols. It is built on top of the Telepathy framework. -%package devel -Summary: 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 >= %{glib2_min_version} -Requires: telepathy-glib-devel >= %{tp_glib_min_version} -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} -Group: Development/Libraries -Requires: glib2 >= %{glib2_min_version} -Requires: gtk2 >= %{gtk2_min_version} -Requires: telepathy-glib >= %{tp_glib_min_version} -Requires: telepathy-mission-control >= %{tp_mc_min_version} - -%description libs -The %{name}-libs package contains shared libraries used by Empathy. - - -%package python -Summary: 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 -%patch1 -p1 -b .pkgconfig -%patch3 -p1 -b .presence-icons -%patch5 -p1 -b .nm +%patch1 -p1 -b .presence-icons +%patch2 -p1 -b .nm # force these to be regenerated rm data/empathy.desktop @@ -145,7 +97,7 @@ rm data/empathy.schemas %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 --disable-static --enable-map=yes --enable-location=yes --enable-megaphone=no --enable-nothere=no +%configure --disable-static --enable-map=yes --enable-location=yes ## 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 @@ -186,8 +138,6 @@ 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 @@ -204,8 +154,6 @@ 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,-) @@ -221,22 +169,15 @@ fi %{_datadir}/telepathy/clients/Empathy.client %{_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 +* Mon Nov 16 2009 Brian Pepple - 2.29.2-1 +- Update to 2.29.2. +- Remove devel, libs, and python subpackages since empathy no longer ships + libempathy and libempathy-gtk as shared libraries. +- Remove configure options no longer available. +- Update source url. +- Drop pkgconfig patch. + * Mon Oct 26 2009 Brian Pepple - 2.28.1.1-2 - Disable panel applets, since they are unmaintained and being dropped from Empathy. diff --git a/presence-icons.patch b/presence-icons.patch index fb28460..19ee4e9 100644 --- a/presence-icons.patch +++ b/presence-icons.patch @@ -1,7 +1,7 @@ -diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c ---- empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c 2009-08-21 09:31:16.000000000 -0400 -+++ empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c 2009-08-25 20:51:05.340069847 -0400 -@@ -227,7 +227,7 @@ presence_chooser_create_model (EmpathyPr +diff -urp empathy-2.29.2.orig/libempathy-gtk/empathy-presence-chooser.c empathy-2.29.2/libempathy-gtk/empathy-presence-chooser.c +--- empathy-2.29.2.orig/libempathy-gtk/empathy-presence-chooser.c 2009-11-13 11:03:46.000000000 -0500 ++++ empathy-2.29.2/libempathy-gtk/empathy-presence-chooser.c 2009-11-16 18:05:16.058911858 -0500 +@@ -228,7 +228,7 @@ presence_chooser_create_model (EmpathyPr gtk_list_store_insert_with_values (store, NULL, -1, COL_STATUS_TEXT, _("Edit Custom Messages..."), diff --git a/sources b/sources index 19bf127..52c97ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e24600feffce66c3b494056f15efa653 empathy-2.28.1.1.tar.bz2 +1ee738907d31549f2dadb2bead938d2b empathy-2.29.2.tar.bz2