From 411e9034d5963a439c30fcc015c3aa504a2231906a1cb11989c19f1e2387cbe1 Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Mon, 29 Apr 2019 14:07:12 +0000
Subject: [PATCH] - change proposal naming and add option to set cpu
 mitigations   (bsc#1128707) - 4.2.0

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-firewall?expand=0&rev=230
---
 yast2-firewall-4.1.11.tar.bz2 | 3 ---
 yast2-firewall-4.2.0.tar.bz2  | 3 +++
 yast2-firewall.changes        | 7 +++++++
 yast2-firewall.spec           | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 yast2-firewall-4.1.11.tar.bz2
 create mode 100644 yast2-firewall-4.2.0.tar.bz2

diff --git a/yast2-firewall-4.1.11.tar.bz2 b/yast2-firewall-4.1.11.tar.bz2
deleted file mode 100644
index c7bd853..0000000
--- a/yast2-firewall-4.1.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9902551b769b7122c669d01dbee3920d231d039d49e651c04130212dc13e17a8
-size 52309
diff --git a/yast2-firewall-4.2.0.tar.bz2 b/yast2-firewall-4.2.0.tar.bz2
new file mode 100644
index 0000000..29d6b3b
--- /dev/null
+++ b/yast2-firewall-4.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bac1d43ef1df37cde3528df62df31e791e346320737d10045cc865e6e4bfd00
+size 52756
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index d0db62f..da47351 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 26 12:30:53 UTC 2019 - jreidinger <jreidinger@suse.com>
+
+- change proposal naming and add option to set cpu mitigations
+  (bsc#1128707)
+- 4.2.0
+
 -------------------------------------------------------------------
 Tue Mar 26 23:44:33 UTC 2019 - knut.anderssen@suse.com
 
diff --git a/yast2-firewall.spec b/yast2-firewall.spec
index 5949cb8..eceffd0 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        4.1.11
+Version:        4.2.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -38,6 +38,8 @@ Requires:       yast2 >= 4.1.67
 
 # ButtonBox widget
 Conflicts:      yast2-ycp-ui-bindings < 2.17.3
+# CpiMitigations
+Conflicts:      yast2-bootloader < 4.2.1
 
 Provides:       yast2-config-firewall
 Obsoletes:      yast2-config-firewall