Accepting request 86155 from GNOME:Apps

done (forwarded request 86129 from Gankov)

OBS-URL: https://build.opensuse.org/request/show/86155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtranslator?expand=0&rev=15
This commit is contained in:
Lars Vogdt 2011-10-03 18:00:11 +00:00 committed by Git OBS Bridge
commit 059037c3fe
3 changed files with 53 additions and 2 deletions

View File

@ -0,0 +1,40 @@
diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
--- gtranslator-2.90.5-orig/configure.ac 2011-08-28 18:59:30.000000000 +0400
+++ gtranslator-2.90.5/configure.ac 2011-08-28 19:02:23.000000000 +0400
@@ -87,7 +87,7 @@
GDA_REQUIRED=4.2.3
PEAS_REQUIRED=1.0.0
GDICT_OPTIONAL=0.11.0
-GTKSPELL_OPTIONAL=100
+GTKSPELL_OPTIONAL=3.0.0
JSON_GLIB_OPTIONAL=0.12.0
AC_ARG_WITH(gda,
@@ -167,7 +167,7 @@
fi
dnl -------------------------------------------------------------------
-dnl Check for gtkspell >= 2.0 and use it if found
+dnl Check for gtkspell >= 3.0 and use it if found
dnl -------------------------------------------------------------------
have_gtkspell=no
AC_ARG_WITH(gtkspell,
@@ -177,7 +177,7 @@
if test x"$with_gtkspell" != "xno"
then
PKG_CHECK_MODULES([GTKSPELL], [
- gtkspell-2.0 >= $GTKSPELL_OPTIONAL
+ gtkspell-3.0 >= $GTKSPELL_OPTIONAL
], have_gtkspell=yes, have_gtkspell=no)
if test x"$have_gtkspell" = "xyes"
@@ -335,7 +335,7 @@
echo "Building spell support: ................................YES"
else
echo "Building spell support: ................................NO"
- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL"
+ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
fi
echo "
Только в gtranslator-2.90.5: configure.ac~

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 26 17:23:33 UTC 2011 - gankov@opensuse.org
- Add support spell check with gtkspell3.
+ Add gtranslator-gtkspell3.patch: add support for gtkspell3.
+ Change pkgconfig(gtkspell-2.0) BuildRequires to
pkgconfig(gtkspell-3.0) so we can build with the new gtkspell.
-------------------------------------------------------------------
Wed Jun 15 11:15:18 UTC 2011 - dimstar@opensuse.org

View File

@ -27,6 +27,8 @@ Group: Development/Tools/Other
Source: http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gtranslator-libgda-5.0.patch bgo#652639 dimstar@opensuse.org -- Add support for libgda 5.0
Patch0: gtranslator-libgda-5.0.patch
# PATCH-FIX-UPSTREAM gtranslator-gtkspell3.patch bgo#660709 gankov@opensuse.org -- Add support for gtkspell3
Patch1: gtranslator-gtkspell3.patch
BuildRequires: fdupes
# Needed by patch0
BuildRequires: gnome-common
@ -42,7 +44,7 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtksourceview-3.0)
BuildRequires: pkgconfig(gtkspell-2.0)
BuildRequires: pkgconfig(gtkspell-3.0)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libpeas-1.0)
@ -72,10 +74,11 @@ files imminently.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
translation-update-upstream
%build
# Required by patch0
# Required by patch0 and patch1
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static \