From 5ce1bda919bd40c3e4272779b0dbf8d89db9589bd234315a83ac6f6e61565e67 Mon Sep 17 00:00:00 2001
From: Martin Vidner <mvidner@suse.com>
Date: Fri, 22 Jul 2011 16:10:11 +0000
Subject: [PATCH] - Support biosdevname=1 NIC naming scheme: don't write
 mac-based udev   rules (FATE#311332). - STARMODE='nfsroot' also for FCoE
 (FATE#306855). - Show NIC device names for unconfigured NICs (FATE#311335). -
 Fixed configuring multiple interfaces with the same VLAN (FATE#311380,  
 FATE#309240, bnc#572747, bnc#588588) - Make the hostname resolvable to our
 static address coming from   Linuxrc (bnc#664929). - 2.21.0

- Do not enable WIRELESS_POWER by default, some APs are broken
  (FATE#309255).

- Obsoleted X-KDE-SubstituteUID replaced with xdg-su in Exec in
  desktop files (bnc#540627)

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=137
---
 yast2-network-2.20.13.tar.bz2 |  3 ---
 yast2-network-2.21.0.tar.bz2  |  3 +++
 yast2-network.changes         | 25 +++++++++++++++++++++++++
 yast2-network.spec            | 15 ++++++++-------
 4 files changed, 36 insertions(+), 10 deletions(-)
 delete mode 100644 yast2-network-2.20.13.tar.bz2
 create mode 100644 yast2-network-2.21.0.tar.bz2

diff --git a/yast2-network-2.20.13.tar.bz2 b/yast2-network-2.20.13.tar.bz2
deleted file mode 100644
index c1d5d78..0000000
--- a/yast2-network-2.20.13.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daadf24077f1106d67eb88cc11cb0054c1851059e59892d4e77b9aaa3912d563
-size 320872
diff --git a/yast2-network-2.21.0.tar.bz2 b/yast2-network-2.21.0.tar.bz2
new file mode 100644
index 0000000..55b6b80
--- /dev/null
+++ b/yast2-network-2.21.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:548a34be1aefb4419b6f17422eed0592281429b39e1c8cdd1b23eabeafa0d935
+size 297643
diff --git a/yast2-network.changes b/yast2-network.changes
index 6ea4490..bd86a4d 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Jul 22 17:49:47 CEST 2011 - mvidner@suse.cz
+
+- Support biosdevname=1 NIC naming scheme: don't write mac-based udev
+  rules (FATE#311332).
+- STARMODE='nfsroot' also for FCoE (FATE#306855).
+- Show NIC device names for unconfigured NICs (FATE#311335).
+- Fixed configuring multiple interfaces with the same VLAN (FATE#311380,
+  FATE#309240, bnc#572747, bnc#588588)
+- Make the hostname resolvable to our static address coming from
+  Linuxrc (bnc#664929).
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Jul 22 17:49:46 CEST 2011 - jreidinger@suse.cz
+
+- Do not enable WIRELESS_POWER by default, some APs are broken
+  (FATE#309255).
+
+-------------------------------------------------------------------
+Fri Jul 22 15:48:16 CEST 2011 - locilka@suse.cz
+
+- Obsoleted X-KDE-SubstituteUID replaced with xdg-su in Exec in
+  desktop files (bnc#540627)
+
 -------------------------------------------------------------------
 Thu Jul 21 13:44:24 CEST 2011 - locilka@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 5bef4ce..82489e5 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,15 +1,15 @@
 #
-# spec file for package yast2-network (Version 2.20.13)
+# spec file for package yast2-network (Version 2.21.0)
 #
 # norootforbuild
 
 Name:		yast2-network
-Version:	2.20.13
+Version:	2.21.0
 Release:	0
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.20.13.tar.bz2
+Source0:	yast2-network-2.21.0.tar.bz2
 
 prefix:		/usr
 
@@ -22,9 +22,10 @@ BuildRequires: yast2-devtools yast2-testsuite
 BuildRequires: yast2-country
 BuildRequires: yast2-installation >= 2.15.27
 
-# NetworkStorage: adapt functions needed for iBFT (bnc#551380)
-BuildRequires: yast2 >= 2.19.3
-Requires:	yast2 >= 2.19.3
+# NetworkInterfaces::GetTypeFromIfcfg (bnc#572747)
+BuildRequires:	yast2 >= 2.21.6
+Requires:	yast2 >= 2.21.6
+
 #netconfig (FaTE #303618)
 Requires:	sysconfig >= 0.71.2
 #GetLanguageCountry
@@ -59,7 +60,7 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.20.13
+%setup -n yast2-network-2.21.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf