From bfcaaca6c24b39330360866240d49b3adf15975dbf7e7d4a99ac58cf3dfc963a Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Fri, 12 Jun 2015 08:19:26 +0000
Subject: [PATCH 1/2] - fate#318804   - moved "Network Settings" into "System"
 group in YaST control     centre - 3.1.118

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=641
---
 yast2-network-3.1.117.tar.bz2 |  3 ---
 yast2-network-3.1.118.tar.bz2 |  3 +++
 yast2-network.changes         |  8 ++++++++
 yast2-network.spec            | 10 +---------
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 yast2-network-3.1.117.tar.bz2
 create mode 100644 yast2-network-3.1.118.tar.bz2

diff --git a/yast2-network-3.1.117.tar.bz2 b/yast2-network-3.1.117.tar.bz2
deleted file mode 100644
index a75c23d..0000000
--- a/yast2-network-3.1.117.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0d8510d2926382f28f8ff885e6278eeb391bd0ad1406c95eabc17d9aac35369
-size 367726
diff --git a/yast2-network-3.1.118.tar.bz2 b/yast2-network-3.1.118.tar.bz2
new file mode 100644
index 0000000..251613b
--- /dev/null
+++ b/yast2-network-3.1.118.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:296ab4da4519b60c2b605cf124e1ff63bffd01e3f5187d1213763da6799d8fad
+size 369260
diff --git a/yast2-network.changes b/yast2-network.changes
index 43bcef4..3dd436b 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 11 07:51:16 UTC 2015 - mfilka@suse.com
+
+- fate#318804
+  - moved "Network Settings" into "System" group in YaST control
+    centre
+- 3.1.118
+
 -------------------------------------------------------------------
 Wed Jun 10 08:37:59 UTC 2015 - mfilka@suse.com
 
diff --git a/yast2-network.spec b/yast2-network.spec
index c205b02..4d13c32 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.117
+Version:        3.1.118
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -83,14 +83,6 @@ This package contains autogenerated documentation for yast2-network
 %install
 %yast_install
 
-%ifarch s390 s390x
-/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/dsl.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/isdn.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/modem.desktop
-%endif
-/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/network.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/provider.desktop
-
 %files
 %defattr(-,root,root)
 %{yast_ybindir}/*

From c60c82eee407e6139bf52a055cca5121d0e853f43eb8608ae5bf27eb1b24cc09 Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Mon, 15 Jun 2015 11:29:09 +0000
Subject: [PATCH 2/2] - Fix handling of AutoYaST parameter keep_install_network
 - 3.1.119

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=642
---
 yast2-network-3.1.118.tar.bz2 | 3 ---
 yast2-network-3.1.119.tar.bz2 | 3 +++
 yast2-network.changes         | 6 ++++++
 yast2-network.spec            | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 yast2-network-3.1.118.tar.bz2
 create mode 100644 yast2-network-3.1.119.tar.bz2

diff --git a/yast2-network-3.1.118.tar.bz2 b/yast2-network-3.1.118.tar.bz2
deleted file mode 100644
index 251613b..0000000
--- a/yast2-network-3.1.118.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:296ab4da4519b60c2b605cf124e1ff63bffd01e3f5187d1213763da6799d8fad
-size 369260
diff --git a/yast2-network-3.1.119.tar.bz2 b/yast2-network-3.1.119.tar.bz2
new file mode 100644
index 0000000..852c4bc
--- /dev/null
+++ b/yast2-network-3.1.119.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8357266ec2d22dcd5c038dbc3ef8ce5eeee6a8c4964aa325645f75a40d3a79e7
+size 369449
diff --git a/yast2-network.changes b/yast2-network.changes
index 3dd436b..aeecef9 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 15 10:46:18 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix handling of AutoYaST parameter keep_install_network
+- 3.1.119
+
 -------------------------------------------------------------------
 Thu Jun 11 07:51:16 UTC 2015 - mfilka@suse.com
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 4d13c32..3722082 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.118
+Version:        3.1.119
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build