- Add upstream patch to mark more strings as translatable which is

required by firewall UI when creating rich rules (bsc#1096542)

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=87

0001-Fix-translating-labels-392.patch

@@ -0,0 +1,35 @@
+From 15fb48d04e576edb828abf321ae1e765822a4ee3 Mon Sep 17 00:00:00 2001
+From: MeggyCal <MeggyCal@users.noreply.github.com>
+Date: Thu, 20 Sep 2018 15:37:17 +0200
+Subject: [PATCH] Fix translating labels (#392)
+
+Fix for #344 was incomplete, the "flags" were not translating and the reported bug was still active.
+
+Fixes: #344
+(cherry picked from commit e657200927a9f0f41fbed95640cd47e2a5836c6f)
+---
+ src/firewall-config.glade | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/firewall-config.glade b/src/firewall-config.glade
+index 22bed58a..75c229b4 100644
+--- a/src/firewall-config.glade
++++ b/src/firewall-config.glade
+@@ -10135,10 +10135,10 @@
+                             <property name="halign">start</property>
+                             <property name="valign">start</property>
+                             <items>
+-                              <item>accept</item>
+-                              <item>reject</item>
+-                              <item>drop</item>
+-                              <item>mark</item>
++                              <item translatable="yes">accept</item>
++                              <item translatable="yes">reject</item>
++                              <item translatable="yes">drop</item>
++                              <item translatable="yes">mark</item>
+                             </items>
+                             <signal name="changed" handler="on_richRuleDialog_changed" swapped="no"/>
+                           </object>
+-- 
+2.19.0
+

firewalld.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 24 09:05:52 UTC 2018 - Markos Chandras <mchandras@suse.de>
+
+- Add upstream patch to mark more strings as translatable which is
+  required by firewall UI when creating rich rules (bsc#1096542)
+
 -------------------------------------------------------------------
 Fri Sep 21 17:13:32 UTC 2018 - Luiz Angelo Daros de Luca <luizluca@gmail.com>
 

firewalld.spec

@@ -32,6 +32,8 @@ Source:         https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%
 Patch0:         0001-firewall-backend-Switch-default-backend-to-iptables.patch
 # PATCH-FIX-UPSTREAM: 0002-firewalld-0.6.x-rich-rule-with-ipset-regression.patch (bsc#1104990) 
 Patch1:         0002-firewalld-0.6.x-rich-rule-with-ipset-regression.patch
+# PATCH-FIX-UPSTREAM: 0001-Fix-translating-labels-392.patch (bsc#1096542)
+Patch2:         0001-Fix-translating-labels-392.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
@@ -116,6 +118,7 @@ firewalld.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # bsc#1078223
 rm config/services/high-availability.xml