From 43eb491251c86585b80dac968529904774d2d47a7c2aa63dfa9b22c746b11102 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Dec 2010 08:57:33 +0000 Subject: [PATCH] Accepting request 55121 from home:vuntz:branches:GNOME:Apps OBS-URL: https://build.opensuse.org/request/show/55121 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=12 --- gtranslator-1.9.12.tar.bz2 | 3 --- gtranslator-1.9.13.tar.bz2 | 3 +++ gtranslator-disable-update-db.patch | 40 +++++++++++++++++++++++++++++ gtranslator.changes | 13 ++++++++++ gtranslator.spec | 12 +++++++-- 5 files changed, 66 insertions(+), 5 deletions(-) delete mode 100644 gtranslator-1.9.12.tar.bz2 create mode 100644 gtranslator-1.9.13.tar.bz2 create mode 100644 gtranslator-disable-update-db.patch diff --git a/gtranslator-1.9.12.tar.bz2 b/gtranslator-1.9.12.tar.bz2 deleted file mode 100644 index e9cadd4..0000000 --- a/gtranslator-1.9.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8dfe6bb381633c14d9a1c45dc4cfe5717e10e8df1d237e6fcfb482c4d68c8b7b -size 4627831 diff --git a/gtranslator-1.9.13.tar.bz2 b/gtranslator-1.9.13.tar.bz2 new file mode 100644 index 0000000..f676444 --- /dev/null +++ b/gtranslator-1.9.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0b371b81630cf2e4efb6968c20f7580c62c34d9161c852a5d008622cd91408e +size 4655865 diff --git a/gtranslator-disable-update-db.patch b/gtranslator-disable-update-db.patch new file mode 100644 index 0000000..6af0ae2 --- /dev/null +++ b/gtranslator-disable-update-db.patch @@ -0,0 +1,40 @@ +Index: gtranslator-1.9.13/configure.ac +=================================================================== +--- gtranslator-1.9.13.orig/configure.ac ++++ gtranslator-1.9.13/configure.ac +@@ -239,6 +239,16 @@ fi + AC_MSG_RESULT($enable_debug) + + dnl ------------------------------------------------------------------- ++dnl Use update-desktop-database? ++dnl ------------------------------------------------------------------- ++ ++AC_ARG_ENABLE(update-mimedb, ++ AC_HELP_STRING([--disable-update-mimedb], ++ [disable the update-mime-database after install [default=no]]),, ++ enable_update_mimedb=yes) ++AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) ++ ++dnl ------------------------------------------------------------------- + dnl Get the date for the man-page and substitute it there and anywhere. + dnl ------------------------------------------------------------------- + MY_DATE=`date +%Y-%m-%d` +Index: gtranslator-1.9.13/data/desktop/Makefile.am +=================================================================== +--- gtranslator-1.9.13.orig/data/desktop/Makefile.am ++++ gtranslator-1.9.13/data/desktop/Makefile.am +@@ -19,6 +19,7 @@ EXTRA_DIST = $(Application_DATA) \ + + CLEANFILES = $(Application_DATA) + ++if ENABLE_UPDATE_MIMEDB + UPDATE_DESKTOP = \ + if [ -f $(Applicationdir)/defaults.list ] ; then \ + if which update-desktop-database>/dev/null 2>&1 ; then \ +@@ -31,4 +32,6 @@ install-data-hook: + + uninstall-hook: + $(UPDATE_DESKTOP) ++endif ++ + -include $(top_srcdir)/git.mk diff --git a/gtranslator.changes b/gtranslator.changes index e8533ee..8b247ec 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 8 08:49:42 CET 2010 - vuntz@opensuse.org + +- Update to version 1.9.13: + + Enable use of local mirrors of open-tran.eu + + Adapt the OpenTran plugin to the new open-tran.eu API + + Misc Bugfixes + + Updated translations. +- Add gtranslator-disable-update-db.patch: add a + --disable-update-mimedb configure option to not run + update-desktop-database on install. +- Pass --disable-update-mimedb to configure. + ------------------------------------------------------------------- Sat Oct 9 10:49:09 CEST 2010 - vuntz@opensuse.org diff --git a/gtranslator.spec b/gtranslator.spec index ab742e7..6ea2312 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -1,5 +1,5 @@ # -# spec file for package gtranslator (Version 1.9.12) +# spec file for package gtranslator (Version 1.9.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,18 +19,22 @@ Name: gtranslator -Version: 1.9.12 +Version: 1.9.13 Release: 1 License: GPLv3+ Summary: A GNOME po file editor with many bells and whistles Group: Development/Tools/Other Url: http://gtranslator.sourceforge.net Source: http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gtranslator-disable-update-db.patch bgo#636749 vuntz@opensuse.org -- Add --disable-update-mimedb configure option +Patch0: gtranslator-disable-update-db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gdl-devel BuildRequires: glib2-devel +# Needed for patch0 +BuildRequires: gnome-common BuildRequires: gnome-utils-devel BuildRequires: gtk2-devel >= 2.16 BuildRequires: gtksourceview-devel @@ -66,11 +70,15 @@ files imminently. %lang_package %prep %setup -q +%patch0 -p1 %build +# Needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --disable-scrollkeeper \ + --disable-update-mimedb \ --with-gtkspell \ --with-dictionary %{__make} %{?jobs:-j%jobs}