From 7d940761eff9be5dce6719988ad6b35d2d5af16059bae09ede046d1c41aa1417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 14 Oct 2016 19:24:18 +0000 Subject: [PATCH] Accepting request 434201 from GNOME:Next New stable still, with tweaks OBS-URL: https://build.opensuse.org/request/show/434201 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=226 --- gnome-desktop-3.22.0.tar.xz | 3 --- gnome-desktop-3.22.1.tar.xz | 3 +++ gnome-desktop.changes | 9 +++++++++ gnome-desktop.spec | 8 ++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 gnome-desktop-3.22.0.tar.xz create mode 100644 gnome-desktop-3.22.1.tar.xz diff --git a/gnome-desktop-3.22.0.tar.xz b/gnome-desktop-3.22.0.tar.xz deleted file mode 100644 index 8cf21df..0000000 --- a/gnome-desktop-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d -size 1073364 diff --git a/gnome-desktop-3.22.1.tar.xz b/gnome-desktop-3.22.1.tar.xz new file mode 100644 index 0000000..067a3a9 --- /dev/null +++ b/gnome-desktop-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6458add4fc3a81fbd9a63db90de22a1e3a62644c1bfd1aca042c43836195aab2 +size 1072872 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index d053628..a490936 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 10 19:49:30 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Updated translations. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. +- Stop passing V=1 to make, we do debugging locally. + ------------------------------------------------------------------- Mon Sep 19 19:27:01 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 4bf3ab6..0ac986a 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -19,7 +19,7 @@ %define IS_DEFAULT_GNOME_DESKTOP 1 Name: gnome-desktop -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: The GNOME Desktop API Library License: LGPL-2.1+ @@ -30,7 +30,9 @@ Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: yelp-tools BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.33.0 BuildRequires: pkgconfig(glib-2.0) >= 2.38.0 @@ -122,7 +124,9 @@ reasons. %lang_package %prep %setup -q +%if !0%{?is_opensuse} translation-update-upstream +%endif %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh @@ -136,7 +140,7 @@ translation-update-upstream %endif --with-gnome-distributor="SUSE" \ --disable-date-in-gnome-version -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install %makeinstall