Mailinglist Archive: opensuse-commit (941 mails)
| < Previous | Next > |
commit pan for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 20 Apr 2012 15:19:24 +0200
- Message-id: <20120420131924.29A96202B4@hilbert.suse.de>
Hello community,
here is the log from the commit of package pan for openSUSE:Factory checked in
at 2012-04-20 15:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pan (Old)
and /work/SRC/openSUSE:Factory/.pan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pan", Maintainer is "drahn@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pan/pan.changes 2012-04-12 09:44:56.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.pan.new/pan.changes 2012-04-20
15:19:23.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 11 20:00:34 UTC 2012 - zaitor@xxxxxxxxxxxx
+
+- Add pan-gtkspell3.patch: Make configure look for the right
+ pkgconfig name for gtkspell3.
+
+-------------------------------------------------------------------
New:
----
pan-gtkspell3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pan.spec ++++++
--- /var/tmp/diff_new_pack.dk5sve/_old 2012-04-20 15:19:24.000000000 +0200
+++ /var/tmp/diff_new_pack.dk5sve/_new 2012-04-20 15:19:24.000000000 +0200
@@ -31,6 +31,8 @@
Patch0: fix-desktop-file-11.0.diff
# PATCH-FIX-UPSTREAM pan-fix-warnings.patch bgo#673820 vuntz@xxxxxxxxxxxx --
Fix gcc warnings breaking the build
Patch1: pan-fix-warnings.patch
+# PATCH-FIX-UPSTREAM pan-gtkspell3.patch bgo#669402 zaitor@xxxxxxxxxxxx --
Make configure look for the right pkgconfig name for gtkspell3.
+Patch2: pan-gtkspell3.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gnome-patch-translation
@@ -52,7 +54,7 @@
BuildRequires: pkgconfig(gtkspell-2.0) >= 2.0.7
%else
BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gtkspell3-2.0) >= 2.0.16
+BuildRequires: pkgconfig(gtkspell-3.0) >= 2.0.16
%endif
BuildRequires: pkgconfig(libnotify) >= 0.4.1
Recommends: %{name}-lang
@@ -73,6 +75,7 @@
gnome-patch-translation-prepare
%patch0
%patch1 -p1
+%patch2 -p1
gnome-patch-translation-update
# needed for patch0
rm pan.desktop
++++++ pan-gtkspell3.patch ++++++
--- pan-0.136-orig/configure.in 2012-04-08 17:30:35.000000000 +0200
+++ pan-0.136/configure.in 2012-04-11 21:25:55.562775659 +0200
@@ -124,7 +124,7 @@
AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
)
if test "x$want_gtkspell" = "xyes" ; then
- PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED],
+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-3.0 >= $GTKSPELL3_REQUIRED enchant
gtkspell_msg=yes
AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for
spellchecking])
--- pan-0.136-orig/configure 2012-04-08 17:32:12.000000000 +0200
+++ pan-0.136/configure 2012-04-11 21:31:23.410954247 +0200
@@ -7191,12 +7191,12 @@
pkg_cv_GTKSPELL_CFLAGS="$GTKSPELL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell3-2.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell-3.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkspell-3.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell3-2.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-3.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7207,12 +7207,12 @@
pkg_cv_GTKSPELL_LIBS="$GTKSPELL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell3-2.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell-3.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkspell-3.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell3-2.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-3.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7232,9 +7232,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtkspell3-2.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`
+ GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtkspell-3.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`
else
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkspell3-2.0
# Put the nasty error message in config.log where it belongs
echo "$GTKSPELL_PKG_ERRORS" >&5
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package pan for openSUSE:Factory checked in
at 2012-04-20 15:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pan (Old)
and /work/SRC/openSUSE:Factory/.pan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pan", Maintainer is "drahn@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pan/pan.changes 2012-04-12 09:44:56.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.pan.new/pan.changes 2012-04-20
15:19:23.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 11 20:00:34 UTC 2012 - zaitor@xxxxxxxxxxxx
+
+- Add pan-gtkspell3.patch: Make configure look for the right
+ pkgconfig name for gtkspell3.
+
+-------------------------------------------------------------------
New:
----
pan-gtkspell3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pan.spec ++++++
--- /var/tmp/diff_new_pack.dk5sve/_old 2012-04-20 15:19:24.000000000 +0200
+++ /var/tmp/diff_new_pack.dk5sve/_new 2012-04-20 15:19:24.000000000 +0200
@@ -31,6 +31,8 @@
Patch0: fix-desktop-file-11.0.diff
# PATCH-FIX-UPSTREAM pan-fix-warnings.patch bgo#673820 vuntz@xxxxxxxxxxxx --
Fix gcc warnings breaking the build
Patch1: pan-fix-warnings.patch
+# PATCH-FIX-UPSTREAM pan-gtkspell3.patch bgo#669402 zaitor@xxxxxxxxxxxx --
Make configure look for the right pkgconfig name for gtkspell3.
+Patch2: pan-gtkspell3.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gnome-patch-translation
@@ -52,7 +54,7 @@
BuildRequires: pkgconfig(gtkspell-2.0) >= 2.0.7
%else
BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gtkspell3-2.0) >= 2.0.16
+BuildRequires: pkgconfig(gtkspell-3.0) >= 2.0.16
%endif
BuildRequires: pkgconfig(libnotify) >= 0.4.1
Recommends: %{name}-lang
@@ -73,6 +75,7 @@
gnome-patch-translation-prepare
%patch0
%patch1 -p1
+%patch2 -p1
gnome-patch-translation-update
# needed for patch0
rm pan.desktop
++++++ pan-gtkspell3.patch ++++++
--- pan-0.136-orig/configure.in 2012-04-08 17:30:35.000000000 +0200
+++ pan-0.136/configure.in 2012-04-11 21:25:55.562775659 +0200
@@ -124,7 +124,7 @@
AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
)
if test "x$want_gtkspell" = "xyes" ; then
- PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED],
+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-3.0 >= $GTKSPELL3_REQUIRED enchant
= $ENCHANT_REQUIRED],[
gtkspell_msg=yes
AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for
spellchecking])
--- pan-0.136-orig/configure 2012-04-08 17:32:12.000000000 +0200
+++ pan-0.136/configure 2012-04-11 21:31:23.410954247 +0200
@@ -7191,12 +7191,12 @@
pkg_cv_GTKSPELL_CFLAGS="$GTKSPELL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell3-2.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell-3.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkspell-3.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell3-2.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-3.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7207,12 +7207,12 @@
pkg_cv_GTKSPELL_LIBS="$GTKSPELL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell3-2.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkspell3-2.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtkspell-3.0 >= \$GTKSPELL3_REQUIRED enchant >=
\$ENCHANT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkspell-3.0 >= $GTKSPELL3_REQUIRED
enchant >= $ENCHANT_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell3-2.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-3.0 >=
$GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7232,9 +7232,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtkspell3-2.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`
+ GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtkspell-3.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`
else
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkspell3-2.0
= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`+ GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkspell-3.0
= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED" 2>&1`fi
# Put the nasty error message in config.log where it belongs
echo "$GTKSPELL_PKG_ERRORS" >&5
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |