rpms/empathy/devel .cvsignore, 1.38, 1.39 empathy-broken-nm.patch, 1.2, 1.3 empathy.spec, 1.77, 1.78 sources, 1.38, 1.39 empathy-video-widget.patch, 1.1, NONE

Mon Sep 21 23:16:46 UTC 2009

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27390

Modified Files:
	.cvsignore empathy-broken-nm.patch empathy.spec sources 
Removed Files:
	empathy-video-widget.patch 
Log Message:
* Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
- Update to 2.28.0.
- Drop video widget patch.  Fixed upstream.
- Update src.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39

--- .cvsignore	8 Sep 2009 17:13:28 -0000	1.38
+++ .cvsignore	21 Sep 2009 23:16:45 -0000	1.39
@@ -1 +1 @@
-empathy-2.27.92.tar.bz2
+empathy-2.28.0.tar.bz2

empathy-broken-nm.patch:
 configure    |   16 ++++++++--------
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: empathy-broken-nm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-nm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- empathy-broken-nm.patch	8 Sep 2009 17:13:28 -0000	1.2
+++ empathy-broken-nm.patch	21 Sep 2009 23:16:46 -0000	1.3
@@ -1,47 +1,47 @@
-diff -urp empathy-2.27.92.OLD/configure empathy-2.27.92/configure
---- empathy-2.27.92.OLD/configure	2009-09-08 11:39:26.000000000 -0400
-+++ empathy-2.27.92/configure	2009-09-08 12:53:07.792273671 -0400
-@@ -18213,16 +18213,16 @@ if test -n "$PKG_CONFIG"; then
+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
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 -      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
-    \"") >&5
+    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
    pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18237,16 +18237,16 @@ if test -n "$PKG_CONFIG"; then
+@@ -15518,16 +15518,16 @@ if test -n "$PKG_CONFIG"; then
      else
          if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 -      libnm_glib >= \$NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= \$NETWORK_MANAGER_REQUIRED
-    \"") >&5
+    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
    pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "
 -      libnm_glib >= $NETWORK_MANAGER_REQUIRED
 +      libnm-glib >= $NETWORK_MANAGER_REQUIRED
     " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -18267,11 +18267,11 @@ else
+@@ -15548,11 +15548,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,9 +55,9 @@ diff -urp empathy-2.27.92.OLD/configure 
     "`
          fi
  	# Put the nasty error message in config.log where it belongs
-diff -urp empathy-2.27.92.OLD/configure.ac empathy-2.27.92/configure.ac
---- empathy-2.27.92.OLD/configure.ac	2009-09-08 11:22:35.000000000 -0400
-+++ empathy-2.27.92/configure.ac	2009-09-08 12:53:30.593270474 -0400
+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
  
     PKG_CHECK_MODULES(NETWORK_MANAGER,


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- empathy.spec	14 Sep 2009 23:45:54 -0000	1.77
+++ empathy.spec	21 Sep 2009 23:16:46 -0000	1.78
@@ -1,28 +1,27 @@
 %{!?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.
+## Minimum required versions.
 %global	gtk2_min_version	2.16
 %global	glib2_min_version	2.16.0
 %global	tp_mc_min_version	5.0.0
-%global	tp_glib_min_version	0.7.34
+%global	tp_glib_min_version	0.7.35
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
 %global webkit_version          1.1.7
 %global libnotify_version       0.4.4
-%global libchamplain_version    0.3.6
+%global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.27.92
-Release:	2%{?dist}
+Version:	2.28.0
+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.27/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 ## Workaround for our broken pkgconfig
@@ -33,9 +32,6 @@ Source1:	%{name}-README.ConnectionManage
 Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
-# Backported patch to fix crash with video widget.
-# http://bugzilla.gnome.org/show_bug.cgi?id=594890
-Patch4:		%{name}-video-widget.patch
 Patch5:		%{name}-broken-nm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,7 +85,7 @@ Requires(preun):	GConf2
 
 Requires(postun):	scrollkeeper
 
-## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
+## 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
 
@@ -139,7 +135,6 @@ bindings to the libempathy and libempath
 %setup -q
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
-%patch4 -p1 -b .video
 %patch5 -p1 -b .nm
 
 # force these to be regenerated
@@ -249,6 +244,11 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
+- Update to 2.28.0.
+- Drop video widget patch.  Fixed upstream.
+- Update src.
+
 * Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-2
 - Back-port patch to prevent video widget from crashing.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	8 Sep 2009 17:13:28 -0000	1.38
+++ sources	21 Sep 2009 23:16:46 -0000	1.39
@@ -1 +1 @@
-888f07eada6eea765123f987d208ea13  empathy-2.27.92.tar.bz2
+a51a560d45595402c32d441f7075b005  empathy-2.28.0.tar.bz2


--- empathy-video-widget.patch DELETED ---


