From 555b3bf2a9aa91d163b88fc6042ef2d89c40b8ca Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 13 Nov 2015 13:15:53 +0100
Subject: [PATCH] Update to 3.18.2

---
 .gitignore                                    |  1 +
 ...or-in-desktop-file-keywords-Romanian.patch | 26 +++++++++++++++++++
 dconf-editor.spec                             |  8 +++++-
 sources                                       |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch

diff --git a/.gitignore b/.gitignore
index af85fb0..be47ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /dconf-editor-3.17.92.tar.xz
 /dconf-editor-3.18.0.tar.xz
 /dconf-editor-3.18.1.tar.xz
+/dconf-editor-3.18.2.tar.xz
diff --git a/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch b/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
new file mode 100644
index 0000000..e80ffd9
--- /dev/null
+++ b/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
@@ -0,0 +1,26 @@
+From c2fc3b75749aa7a4ec4e13fbf8abbeb8166646cf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Fri, 13 Nov 2015 13:16:29 +0100
+Subject: [PATCH] Fix a syntax error in desktop file keywords Romanian
+ translation
+
+---
+ po/ro.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/ro.po b/po/ro.po
+index 9ddcb2b..e0d6070 100644
+--- a/po/ro.po
++++ b/po/ro.po
+@@ -35,7 +35,7 @@ msgstr ""
+ 
+ #: ../editor/ca.desrt.dconf-editor.desktop.in.in.h:3
+ msgid "settings;configuration;"
+-msgstr "settings;configuration;configurări;configurație;setări"
++msgstr "settings;configuration;configurări;configurație;setări;"
+ 
+ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:1
+ msgid "The width of the window"
+-- 
+2.5.0
+
diff --git a/dconf-editor.spec b/dconf-editor.spec
index 32d4b9d..35d834d 100644
--- a/dconf-editor.spec
+++ b/dconf-editor.spec
@@ -1,11 +1,13 @@
 Name:           dconf-editor
-Version:        3.18.1
+Version:        3.18.2
 Release:        1%{?dist}
 Summary:        Configuration editor for dconf
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/dconf
 Source0:        https://download.gnome.org/sources/dconf-editor/3.18/dconf-editor-%{version}.tar.xz
+# Backported from upstream
+Patch0:         0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
 
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  desktop-file-utils
@@ -22,6 +24,7 @@ Graphical tool for editing the dconf configuration database.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -62,6 +65,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_mandir}/man1/dconf-editor.1*
 
 %changelog
+* Fri Nov 13 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
+- Update to 3.18.2
+
 * Mon Oct 12 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
 - Update to 3.18.1
 
diff --git a/sources b/sources
index 13030bd..ed0c342 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ff30290d9c52be54fde9d3ecd73ea31  dconf-editor-3.18.1.tar.xz
+9292d9b96b0d9f87f6589a7d1d0ca388  dconf-editor-3.18.2.tar.xz