From 77ec679249029661e9fa49409ce87db685b48f31766e658e3661f5fefda677f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 10 Nov 2015 19:04:33 +0000 Subject: [PATCH] Accepting request 343494 from home:Zaitor Ver bump + Drop patches OBS-URL: https://build.opensuse.org/request/show/343494 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=299 --- gnome-control-center-3.18.1.tar.xz | 3 -- gnome-control-center-3.18.2.tar.xz | 3 ++ ...ontrol-center-fix-desktop-file-trans.patch | 42 ------------------- gnome-control-center-fix-nb-tans.patch | 12 ------ gnome-control-center.changes | 10 +++++ gnome-control-center.spec | 8 +--- 6 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 gnome-control-center-3.18.1.tar.xz create mode 100644 gnome-control-center-3.18.2.tar.xz delete mode 100644 gnome-control-center-fix-desktop-file-trans.patch delete mode 100644 gnome-control-center-fix-nb-tans.patch diff --git a/gnome-control-center-3.18.1.tar.xz b/gnome-control-center-3.18.1.tar.xz deleted file mode 100644 index cb28665..0000000 --- a/gnome-control-center-3.18.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41 -size 7106816 diff --git a/gnome-control-center-3.18.2.tar.xz b/gnome-control-center-3.18.2.tar.xz new file mode 100644 index 0000000..25d972f --- /dev/null +++ b/gnome-control-center-3.18.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad +size 7113676 diff --git a/gnome-control-center-fix-desktop-file-trans.patch b/gnome-control-center-fix-desktop-file-trans.patch deleted file mode 100644 index 14de336..0000000 --- a/gnome-control-center-fix-desktop-file-trans.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Mon, 12 Oct 2015 15:13:26 +0200 -Subject: Fix syntax errors in gnome-sharing-panel.desktop translations - -Remove erroneous linefeeds from gnome-sharing-panel.desktop translations -that break desktop file syntax. ---- - po/sr.po | 2 +- - po/sr@latin.po | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/po/sr.po b/po/sr.po -index 6efaf6d..4120c56 100644 ---- a/po/sr.po -+++ b/po/sr.po -@@ -5128,7 +5128,7 @@ msgid "" - "server;renderer;" - msgstr "" - "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;" --"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n" -+"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;" - "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;" - "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;" - -diff --git a/po/sr@latin.po b/po/sr@latin.po -index 0947ba4..52e423c 100644 ---- a/po/sr@latin.po -+++ b/po/sr@latin.po -@@ -5198,9 +5198,6 @@ msgid "" - msgstr "" - "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;" - "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;" --"iscrtavač;\n" --"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;" --"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;" - "iscrtavač;" - - #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 --- -cgit v0.11.2 - diff --git a/gnome-control-center-fix-nb-tans.patch b/gnome-control-center-fix-nb-tans.patch deleted file mode 100644 index 1d254a7..0000000 --- a/gnome-control-center-fix-nb-tans.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnome-control-center-3.17.90-orig/po/nb.po 2015-08-12 17:42:56.000000000 +0200 -+++ gnome-control-center-3.17.90/po/nb.po 2015-08-18 13:48:05.526900500 +0200 -@@ -3921,7 +3921,7 @@ - - #: ../panels/power/cc-power-panel.c:1621 - msgid "_Keyboard brightness" --msgstr "Lysstyrke for s_kjerm" -+msgstr "Lysstyrke for tastatur" - - #: ../panels/power/cc-power-panel.c:1631 - msgid "_Dim screen when inactive" - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 3db749c..8fa4395 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 10 15:58:06 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.18.2: + + Build fixes. + + Fix a number of memory leaks. + + Updated translations. +- Drop gnome-control-center-fix-desktop-file-trans.patch and + gnome-control-center-fix-nb-tans.patch: Fixed upstream. + ------------------------------------------------------------------- Mon Oct 12 13:13:25 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index a8b74fe..4f2fb2f 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,7 +29,7 @@ %define with_cacert_patch 1 Name: gnome-control-center -Version: 3.18.1 +Version: 3.18.2 Release: 0 # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center @@ -50,10 +50,6 @@ Patch15: gcc-private-connection.patch Patch16: gnome-control-center-probe-radius-server-cert.patch # PATCH-NEEDS-REBASE was: PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch -# PATCH-FIX-UPSTREAM gnome-control-center-fix-nb-tans.patch bgo#753005 zaitor@opensuse.org -- Fix translation of Keyboard brightness in Norwegian bokmål. -Patch18: gnome-control-center-fix-nb-tans.patch -# PATCH-FIX-UPSTREAM gnome-control-center-fix-desktop-file-trans.patch zaitor@opensuse.org -- Fix syntax errors in gnome-sharing-panel.desktop translations -Patch19: gnome-control-center-fix-desktop-file-trans.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -198,8 +194,6 @@ translation-update-upstream #%%patch17 -p1 #NEEDS-REBASE #patch14 -p1 -%patch18 -p1 -%patch19 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh