Hello community, here is the log from the commit of package gnome-screenshot for openSUSE:Factory checked in at 2015-05-07 09:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-screenshot (Old) and /work/SRC/openSUSE:Factory/.gnome-screenshot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-screenshot" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-screenshot/gnome-screenshot.changes 2015-03-30 19:19:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-screenshot.new/gnome-screenshot.changes 2015-05-07 09:22:09.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 1 23:54:21 UTC 2015 - [email protected] + +- Add gnome-screenshot-fix-translations.patch: Fix translations, + patch from upstream git. +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + +------------------------------------------------------------------- New: ---- gnome-screenshot-fix-translations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screenshot.spec ++++++ --- /var/tmp/diff_new_pack.FbGnzq/_old 2015-05-07 09:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.FbGnzq/_new 2015-05-07 09:22:10.000000000 +0200 @@ -26,7 +26,11 @@ Source: http://download.gnome.org/sources/gnome-screenshot/3.16/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE gnome-screenshot-onlyshowin.patch [email protected] -- OnlyShowIn=GNOME: fix brp build check, allowing to use the icon from the gnome theme. Patch0: gnome-screenshot-onlyshowin.patch +# PATCH-FIX-UPSTREAM gnome-screenshot-fix-translations.patch bgo#746973 bgo#747125 [email protected] -- Fix translations not being applied. From git master. +Patch1: gnome-screenshot-fix-translations.patch BuildRequires: intltool >= 0.40.0 +# Needed for patch1 +BuildRequires: libtool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) >= 2.35.1 @@ -47,9 +51,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build +# Needed for patch1 +autoreconf -fiv %configure --disable-static make %{?_smp_mflags} ++++++ gnome-screenshot-fix-translations.patch ++++++ >From cd3d146608b215266a527fcd4edaf460efaf5cd8 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Sun, 29 Mar 2015 14:52:53 +0200 Subject: build: Fix translations not being applied DATADIRNAME is unset unless we call AM_GLIB_GNU_GETTEXT. It's supposed to contain "share" on most systems. This caused translations to be loaded from the wrong directory. https://bugzilla.gnome.org/show_bug.cgi?id=746973 diff --git a/configure.ac b/configure.ac index 43054c8..6012985 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d IT_PROG_INTLTOOL(0.40.0) PKG_PROG_PKG_CONFIG([0.22]) +AM_GLIB_GNU_GETTEXT + AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -- cgit v0.10.2 >From 65473b2912bb696d7b7da9d0943aef6c6e26254f Mon Sep 17 00:00:00 2001 From: Matthias Clasen <[email protected]> Date: Wed, 1 Apr 2015 19:50:18 -0400 Subject: Fix schema translations There are two fixes here. First, we need to use the correct gettext domain in the schema file and second, we must not merge translations back into the xml file, since dconf-editor can't deal with that. http://bugzilla.gnome.org/show_bug.cgi?id=747125 diff --git a/src/Makefile.am b/src/Makefile.am index 43731b0..f3b7fff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,9 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml) appdata_in_files = org.gnome.Screenshot.appdata.xml.in @INTLTOOL_XML_RULE@ +%.gschema.xml: %.gschema.xml.in + $(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@ + dbusservicedir = $(datadir)/dbus-1/services dbusservice_DATA = org.gnome.Screenshot.service diff --git a/src/org.gnome.gnome-screenshot.gschema.xml.in b/src/org.gnome.gnome-screenshot.gschema.xml.in index ea8a09a..8d08edf 100644 --- a/src/org.gnome.gnome-screenshot.gschema.xml.in +++ b/src/org.gnome.gnome-screenshot.gschema.xml.in @@ -1,4 +1,4 @@ -<schemalist gettext-domain="gnome-utils-2.0"> +<schemalist gettext-domain="gnome-screenshot"> <enum id="org.gnome.gnome-screenshot.file-types"> <value nick="bmp" value="0"/> <value nick="jpg" value="1"/> -- cgit v0.10.2
