Hello community, here is the log from the commit of package gtranslator for openSUSE:Factory checked in at Wed Jul 13 10:21:32 CEST 2011.
-------- --- GNOME/gtranslator/gtranslator.changes 2011-06-01 13:59:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtranslator/gtranslator.changes 2011-07-01 14:19:04.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Jun 15 11:15:18 UTC 2011 - dims...@opensuse.org + +- 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 - vu...@opensuse.org + +- Update to version 2.90.5: + + Misc bugfixes + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gtranslator-2.90.4.tar.bz2 New: ---- gtranslator-2.90.5.tar.bz2 gtranslator-libgda-5.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtranslator.spec ++++++ --- /var/tmp/diff_new_pack.NAhROL/_old 2011-07-13 10:15:46.000000000 +0200 +++ /var/tmp/diff_new_pack.NAhROL/_new 2011-07-13 10:15:46.000000000 +0200 @@ -18,16 +18,22 @@ 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 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 dims...@opensuse.org -- Add support for libgda 5.0 +Patch0: gtranslator-libgda-5.0.patch BuildRequires: fdupes +# 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 BuildRequires: pkgconfig(gdict-1.0) @@ -39,7 +45,6 @@ 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 +71,18 @@ %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 ++++++ gtranslator-2.90.4.tar.bz2 -> gtranslator-2.90.5.tar.bz2 ++++++ ++++ 14064 lines of diff (skipped) ++++++ gtranslator-libgda-5.0.patch ++++++ 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 */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
