From 11e93123ff9ecb76938a97809d98302262c9aaa0ff11e075d38658c9911e1f38 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 15 Jun 2011 09:20:40 +0000 Subject: [PATCH 1/3] Accepting request 73654 from home:vuntz:branches:GNOME:Apps Update to 2.90.5 OBS-URL: https://build.opensuse.org/request/show/73654 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=21 --- gtranslator-2.90.4.tar.bz2 | 3 --- gtranslator-2.90.5.tar.bz2 | 3 +++ gtranslator.changes | 7 +++++++ gtranslator.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 gtranslator-2.90.4.tar.bz2 create mode 100644 gtranslator-2.90.5.tar.bz2 diff --git a/gtranslator-2.90.4.tar.bz2 b/gtranslator-2.90.4.tar.bz2 deleted file mode 100644 index f695a52..0000000 --- a/gtranslator-2.90.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9d0eeb4fc9ee3a98f84dad7a7112186a0bffa8d4262f72febf2ba52dcd32c7 -size 4681958 diff --git a/gtranslator-2.90.5.tar.bz2 b/gtranslator-2.90.5.tar.bz2 new file mode 100644 index 0000000..330a897 --- /dev/null +++ b/gtranslator-2.90.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505 +size 4623962 diff --git a/gtranslator.changes b/gtranslator.changes index 7c6ee3e..d0f35ad 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 15 09:56:24 CEST 2011 - vuntz@opensuse.org + +- Update to version 2.90.5: + + Misc bugfixes + + Updated translations. + ------------------------------------------------------------------- Tue May 24 19:36:30 CEST 2011 - dimstar@opensuse.org diff --git a/gtranslator.spec b/gtranslator.spec index bbbc62a..5535dfd 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -18,7 +18,7 @@ Name: gtranslator -Version: 2.90.4 +Version: 2.90.5 Release: 1 License: GPLv3+ Summary: A GNOME po file editor with many bells and whistles From 2a0b1e77bde00faef266f5b8b24a008faa1ae87fb7649305c95cb598eb4de28e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 1 Jul 2011 12:16:04 +0000 Subject: [PATCH 2/3] Accepting request 73685 from home:dimstar:branches:GNOME:Apps Resubmit... this patch has been accepted upstream, flagged as commit_now OBS-URL: https://build.opensuse.org/request/show/73685 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=22 --- gtranslator-libgda-5.0.patch | 106 +++++++++++++++++++++++++++++++++++ gtranslator.changes | 13 +++++ gtranslator.spec | 12 +++- 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 gtranslator-libgda-5.0.patch diff --git a/gtranslator-libgda-5.0.patch b/gtranslator-libgda-5.0.patch new file mode 100644 index 0000000..3c10d94 --- /dev/null +++ b/gtranslator-libgda-5.0.patch @@ -0,0 +1,106 @@ +Index: gtranslator-2.90.5/configure.ac +=================================================================== +--- gtranslator-2.90.5.orig/configure.ac ++++ gtranslator-2.90.5/configure.ac +@@ -84,12 +84,16 @@ GLIB_REQUIRED=2.28.0 + LIBXML_REQUIRED=2.4.12 + SOURCEVIEW_REQUIRED=3.0.0 + GDL_REQUIRED=2.91.1 +-GDA_REQUIRED=4.2.0 ++GDA_REQUIRED=4.2.3 + PEAS_REQUIRED=1.0.0 + GDICT_OPTIONAL=0.11.0 + GTKSPELL_OPTIONAL=100 + JSON_GLIB_OPTIONAL=0.12.0 + ++AC_ARG_WITH(gda, ++ AS_HELP_STRING([--with-gda={4.0|5.0}],[Define which version of libgda to use]),, ++ with_gda=4.0) ++ + PKG_CHECK_MODULES(GTRANSLATOR, [ + libxml-2.0 >= $LIBXML_REQUIRED + gthread-2.0 >= $GTHREAD_REQUIRED +@@ -99,7 +103,7 @@ PKG_CHECK_MODULES(GTRANSLATOR, [ + gtksourceview-3.0 >= $SOURCEVIEW_REQUIRED + gdl-3.0 >= $GDL_REQUIRED + gsettings-desktop-schemas +- libgda-4.0 >= $GDA_REQUIRED ++ libgda-$with_gda >= $GDA_REQUIRED + libpeas-1.0 >= $PEAS_REQUIRED + libpeas-gtk-1.0 >= $PEAS_REQUIRED + ]) +Index: gtranslator-2.90.5/src/translation-memory/gda/gtr-gda.c +=================================================================== +--- gtranslator-2.90.5.orig/src/translation-memory/gda/gtr-gda.c ++++ gtranslator-2.90.5/src/translation-memory/gda/gtr-gda.c +@@ -775,38 +775,38 @@ gtr_gda_init (GtrGda * self) + GDA_CONNECTION_OPTIONS_NONE, + NULL); + +- gda_execute_non_select_command (self->priv->db, +- "create table WORD (" +- "ID integer primary key autoincrement," +- "VALUE text unique)", +- NULL); +- +- gda_execute_non_select_command (self->priv->db, +- "create table WORD_ORIG_LINK (" +- "WORD_ID integer," +- "ORIG_ID integer," +- "primary key (WORD_ID, ORIG_ID))", +- NULL); +- +- gda_execute_non_select_command (self->priv->db, +- "create table ORIG (" +- "ID integer primary key autoincrement," +- "VALUE text unique," +- "SENTENCE_SIZE integer)", +- NULL); +- +- gda_execute_non_select_command (self->priv->db, +- "create table TRANS (" +- "ID integer primary key autoincrement," +- "ORIG_ID integer," +- "VALUE text)", +- NULL); +- +- gda_execute_non_select_command (self->priv->db, +- "create index " +- "if not exists IDX_TRANS_ORIG_ID " +- "on TRANS (ORIG_ID)", +- NULL); ++ gda_connection_execute_non_select_command (self->priv->db, ++ "create table WORD (" ++ "ID integer primary key autoincrement," ++ "VALUE text unique)", ++ NULL); ++ ++ gda_connection_execute_non_select_command (self->priv->db, ++ "create table WORD_ORIG_LINK (" ++ "WORD_ID integer," ++ "ORIG_ID integer," ++ "primary key (WORD_ID, ORIG_ID))", ++ NULL); ++ ++ gda_connection_execute_non_select_command (self->priv->db, ++ "create table ORIG (" ++ "ID integer primary key autoincrement," ++ "VALUE text unique," ++ "SENTENCE_SIZE integer)", ++ NULL); ++ ++ gda_connection_execute_non_select_command (self->priv->db, ++ "create table TRANS (" ++ "ID integer primary key autoincrement," ++ "ORIG_ID integer," ++ "VALUE text)", ++ NULL); ++ ++ gda_connection_execute_non_select_command (self->priv->db, ++ "create index " ++ "if not exists IDX_TRANS_ORIG_ID " ++ "on TRANS (ORIG_ID)", ++ NULL); + + /* prepare statements */ + diff --git a/gtranslator.changes b/gtranslator.changes index d0f35ad..5b37f35 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 15 11:15:18 UTC 2011 - dimstar@opensuse.org + +- Replace pkgconfig(libgda-4.0) BuildRequires with libgda-devel: + this allows us to use libgda-4.0 and libgda-5.0 without knowledge + of what is in the repository. +- Pass --with-gda=4.0|5.0 to configure (4.0 and 5.0 is extracted + from the rpm database, based on what libgda-devel has been + installed) +- Add gtranslator-libgda-5.0.patch: Add support for libgda-5.0 with + a new --with-gda parameter. +- Add gnome-common BuildRequires plus call to gnome-autogen.sh. + ------------------------------------------------------------------- Wed Jun 15 09:56:24 CEST 2011 - vuntz@opensuse.org diff --git a/gtranslator.spec b/gtranslator.spec index 5535dfd..8f555ec 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -25,9 +25,14 @@ Summary: A GNOME po file editor with many bells and whistles Url: http://gtranslator.sourceforge.net 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 BuildRequires: fdupes +# Require by patch0 +BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: libgda-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdict-1.0) @@ -39,7 +44,6 @@ BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(gtkspell-2.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(libgda-4.0) BuildRequires: pkgconfig(libpeas-1.0) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libxml-2.0) @@ -66,14 +70,18 @@ files imminently. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +# Required by patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --disable-scrollkeeper \ --with-gtkspell \ - --with-dictionary + --with-dictionary \ + --with-gda=$(rpm -q --provides $(rpm -q --whatprovides libgda-devel) | grep "pkgconfig(libgda-[45].0)" | cut -b 18-20) %{__make} %{?_smp_mflags} %install From 402885ae9df9a1c77cbcff7f58ac709870dc3eae6a4d7552a7360efedcc5b807 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 1 Jul 2011 12:19:14 +0000 Subject: [PATCH 3/3] Accepting request 74995 from home:vuntz:branches:GNOME:Apps tweak OBS-URL: https://build.opensuse.org/request/show/74995 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=23 --- gtranslator.changes | 20 +++++++++++--------- gtranslator.spec | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gtranslator.changes b/gtranslator.changes index 5b37f35..979c7de 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,15 +1,17 @@ ------------------------------------------------------------------- Wed Jun 15 11:15:18 UTC 2011 - dimstar@opensuse.org -- Replace pkgconfig(libgda-4.0) BuildRequires with libgda-devel: - this allows us to use libgda-4.0 and libgda-5.0 without knowledge - of what is in the repository. -- Pass --with-gda=4.0|5.0 to configure (4.0 and 5.0 is extracted - from the rpm database, based on what libgda-devel has been - installed) -- Add gtranslator-libgda-5.0.patch: Add support for libgda-5.0 with - a new --with-gda parameter. -- Add gnome-common BuildRequires plus call to gnome-autogen.sh. +- Add optional port to libgda 5.0: + + Add gtranslator-libgda-5.0.patch: add support for libgda-5.0 + with a new --with-gda parameter. + + Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for the patch to be taken into account. + + Replace pkgconfig(libgda-4.0) BuildRequires with libgda-devel: + this allows us to use libgda-4.0 and libgda-5.0 without + knowledge of what version is in the repository. + + Pass --with-gda=4.0|5.0 to configure: the version (4.0 or 5.0) + is extracted from the rpm database, based on the libgda-devel + package that has been installed. ------------------------------------------------------------------- Wed Jun 15 09:56:24 CEST 2011 - vuntz@opensuse.org diff --git a/gtranslator.spec b/gtranslator.spec index 8f555ec..3cd4890 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -28,10 +28,11 @@ Source: http://www.kabalak.net/gtranslator/download/releases/%{version}/ # 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 BuildRequires: fdupes -# Require by patch0 +# Needed by patch0 BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +# Not using a pkgconfig() BuildRequires, to allow building against libgda 4.0 and 5.0 BuildRequires: libgda-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files