Mailinglist Archive: opensuse-commit (762 mails)
| < Previous | Next > |
commit empathy for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 30 Aug 2010 12:32:57 +0200
- Message-id: <20100830103257.7197B202B1@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package empathy for openSUSE:Factory
checked in at Mon Aug 30 12:32:57 CEST 2010.
--------
--- GNOME/empathy/empathy.changes 2010-08-24 15:58:35.000000000 +0200
+++ empathy/empathy.changes 2010-08-29 11:45:58.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Aug 29 11:44:33 CEST 2010 - vuntz@xxxxxxxxxxxx
+
+- Add empathy-libchamplain-0.8.patch to fix build with latest
+ libchamplain.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
empathy-libchamplain-0.8.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ empathy.spec ++++++
--- /var/tmp/diff_new_pack.FtQlAI/_old 2010-08-30 12:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.FtQlAI/_new 2010-08-30 12:32:43.000000000 +0200
@@ -19,13 +19,15 @@
Name: empathy
Version: 2.31.90
-Release: 1
+Release: 2
License: GPLv2+
Summary: Instant Messenger Client for GNOME, based on Telepathy
Url: http://live.gnome.org/Empathy
Group: Productivity/Networking/Instant Messenger
Source: %{name}-%{version}.tar.bz2
Source99: %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM empathy-libchamplain-0.8.patch vuntz@xxxxxxxxxxxx --
Taken from git, fix build with latest libchamplain
+Patch0: empathy-libchamplain-0.8.patch
BuildRequires: NetworkManager-devel
BuildRequires: enchant-devel
BuildRequires: evolution-data-server-devel
@@ -91,6 +93,7 @@
%prep
%setup -q
translation-update-upstream
+%patch0 -p1
%build
%configure --disable-static \
++++++ empathy-libchamplain-0.8.patch ++++++
Index: empathy-2.31.90/configure
===================================================================
--- empathy-2.31.90.orig/configure
+++ empathy-2.31.90/configure
@@ -2627,8 +2627,8 @@ CLUTTER_GTK_REQUIRED=0.10
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.11
ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.4
+LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
+LIBCHAMPLAIN_REQUIRED=0.7.1
NAUTILUS_SENDTO_REQUIRED=2.28.1
NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
@@ -16557,21 +16557,21 @@ if test -n "$PKG_CONFIG"; then
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"
- champlain-0.4 >= \$LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= \$LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= \$LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= \$LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
" 2>/dev/null`
else
@@ -16587,21 +16587,21 @@ if test -n "$PKG_CONFIG"; then
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"
- champlain-0.4 >= \$LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= \$LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= \$LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= \$LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
" 2>/dev/null`
else
@@ -16623,14 +16623,14 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
"`
else
LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
"`
fi
Index: empathy-2.31.90/configure.ac
===================================================================
--- empathy-2.31.90.orig/configure.ac
+++ empathy-2.31.90/configure.ac
@@ -49,8 +49,8 @@ CLUTTER_GTK_REQUIRED=0.10
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.11
ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.4
+LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
+LIBCHAMPLAIN_REQUIRED=0.7.1
NAUTILUS_SENDTO_REQUIRED=2.28.1
NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
@@ -356,8 +356,8 @@ if test "x$enable_map" != "xno"; then
if test "x$have_gtk3" == "xno"; then
PKG_CHECK_MODULES(LIBCHAMPLAIN,
[
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |