rpms/empathy/devel .cvsignore, 1.37, 1.38 empathy-broken-nm.patch, 1.1, 1.2 empathy-broken-pkgconfig.patch, 1.5, 1.6 empathy.spec, 1.75, 1.76 sources, 1.37, 1.38 empathy-desktop-category.patch, 1.1, NONE empathy-fix-nav-handling.patch, 1.1, NONE
Brian Pepple
bpepple at fedoraproject.org
Tue Sep 8 17:13:29 UTC 2009
Author: bpepple
Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18043
Modified Files:
.cvsignore empathy-broken-nm.patch
empathy-broken-pkgconfig.patch empathy.spec sources
Removed Files:
empathy-desktop-category.patch empathy-fix-nav-handling.patch
Log Message:
* Tue Sep 8 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-1
- Update to 2.27.92.
- Drop desktop category patch. Fixed upstream.
- Drop fix-nav-handling patch. Fixed upstream.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore 26 Aug 2009 18:39:49 -0000 1.37
+++ .cvsignore 8 Sep 2009 17:13:28 -0000 1.38
@@ -1 +1 @@
-empathy-2.27.91.1.tar.bz2
+empathy-2.27.92.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- empathy-broken-nm.patch 2 Sep 2009 00:56:03 -0000 1.1
+++ empathy-broken-nm.patch 8 Sep 2009 17:13:28 -0000 1.2
@@ -1,7 +1,7 @@
-diff -urp empathy-2.27.91.1.OLD/configure empathy-2.27.91.1/configure
---- empathy-2.27.91.1.OLD/configure 2009-08-25 11:58:07.000000000 -0400
-+++ empathy-2.27.91.1/configure 2009-09-01 20:19:21.000104092 -0400
-@@ -18227,16 +18227,16 @@ if test -n "$PKG_CONFIG"; then
+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
else
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
@@ -21,7 +21,7 @@ diff -urp empathy-2.27.91.1.OLD/configur
" 2>/dev/null`
else
pkg_failed=yes
-@@ -18251,16 +18251,16 @@ if test -n "$PKG_CONFIG"; then
+@@ -18237,16 +18237,16 @@ if test -n "$PKG_CONFIG"; then
else
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
@@ -41,7 +41,7 @@ diff -urp empathy-2.27.91.1.OLD/configur
" 2>/dev/null`
else
pkg_failed=yes
-@@ -18281,11 +18281,11 @@ else
+@@ -18267,11 +18267,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.91.1.OLD/configur
"`
fi
# Put the nasty error message in config.log where it belongs
-diff -urp empathy-2.27.91.1.OLD/configure.ac empathy-2.27.91.1/configure.ac
---- empathy-2.27.91.1.OLD/configure.ac 2009-08-25 11:46:02.000000000 -0400
-+++ empathy-2.27.91.1/configure.ac 2009-09-01 20:18:24.951104847 -0400
+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
@@ -183,7 +183,7 @@ else
PKG_CHECK_MODULES(NETWORK_MANAGER,
empathy-broken-pkgconfig.patch:
libempathy-gtk/libempathy-gtk.pc.in | 3 +--
libempathy/libempathy.pc.in | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- empathy-broken-pkgconfig.patch 26 Aug 2009 22:10:42 -0000 1.5
+++ empathy-broken-pkgconfig.patch 8 Sep 2009 17:13:28 -0000 1.6
@@ -1,25 +1,25 @@
-diff -urp empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in empathy-2.27.91.1/libempathy/libempathy.pc.in
---- empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in 2009-05-18 05:58:49.000000000 -0400
-+++ empathy-2.27.91.1/libempathy/libempathy.pc.in 2009-08-26 16:59:16.000000000 -0400
+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, libmissioncontrol, \
+-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.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in
---- empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in 2009-05-18 06:14:46.000000000 -0400
-+++ empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in 2009-08-26 16:59:39.000000000 -0400
+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, libmissioncontrol, \
+-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@
Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- empathy.spec 2 Sep 2009 00:56:03 -0000 1.75
+++ empathy.spec 8 Sep 2009 17:13:28 -0000 1.76
@@ -14,8 +14,8 @@
%global libchamplain_version 0.3.6
Name: empathy
-Version: 2.27.91.1
-Release: 6%{?dist}
+Version: 2.27.92
+Release: 1%{?dist}
Summary: Instant Messaging Client for GNOME
Group: Applications/Communications
@@ -31,11 +31,8 @@ Source1: %{name}-README.ConnectionManage
## Removes old mission-control lookup
## http://bugzilla.gnome.org/show_bug.cgi?id=593224
Patch1: %{name}-broken-pkgconfig.patch
-Patch2: %{name}-desktop-category.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=592853
Patch3: presence-icons.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593318
-Patch4: %{name}-fix-nav-handling.patch
Patch5: %{name}-broken-nm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,9 +135,7 @@ bindings to the libempathy and libempath
%prep
%setup -q
%patch1 -p1 -b .pkgconfig
-%patch2 -p1 -b .desktop
%patch3 -p1 -b .presence-icons
-%patch4 -p1 -b .fix-nav-handling
%patch5 -p1 -b .nm
# force these to be regenerated
@@ -250,6 +245,11 @@ fi
%{python_sitearch}/empathy*.so
%changelog
+* Tue Sep 8 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.92-1
+- Update to 2.27.92.
+- Drop desktop category patch. Fixed upstream.
+- Drop fix-nav-handling patch. Fixed upstream.
+
* Tue Sep 1 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-6
- Add patch to workaround NetworkManager pc file name change.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources 26 Aug 2009 18:39:49 -0000 1.37
+++ sources 8 Sep 2009 17:13:28 -0000 1.38
@@ -1 +1 @@
-6845b138d9f597932886345aeac82bc5 empathy-2.27.91.1.tar.bz2
+888f07eada6eea765123f987d208ea13 empathy-2.27.92.tar.bz2
--- empathy-desktop-category.patch DELETED ---
--- empathy-fix-nav-handling.patch DELETED ---
More information about the scm-commits
mailing list