From 888db18c39046b4c4aaa319b4e0f44f217d8133dc795f2e0097dc3a6009aa268 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.com>
Date: Thu, 23 Feb 2012 10:46:35 +0000
Subject: [PATCH] - added popup with security question when proxy url contains
 password (http://usr:pass@proxy) - bnc 694582 - fixed testsuite - 2.22.3

- Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12)

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

diff --git a/yast2-network-2.22.2.tar.bz2 b/yast2-network-2.22.2.tar.bz2
deleted file mode 100644
index cb4b5bc..0000000
--- a/yast2-network-2.22.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:289ae2e754b7e8d4d110702a54642137bed3dea6d73389568e2f410b9108f0ec
-size 296837
diff --git a/yast2-network-2.22.3.tar.bz2 b/yast2-network-2.22.3.tar.bz2
new file mode 100644
index 0000000..ae9d0f6
--- /dev/null
+++ b/yast2-network-2.22.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bcdb7ec1722fe3d2c260d510b69a041657296c288053e0edccf0bf303bbe517
+size 297769
diff --git a/yast2-network.changes b/yast2-network.changes
index d9a9471..ed632cc 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Feb 23 08:52:06 UTC 2012 - mfilka@suse.com
+
+- added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582
+- fixed testsuite
+- 2.22.3 
+
+-------------------------------------------------------------------
+Tue Jan 31 17:36:27 CET 2012 - mvidner@suse.cz
+
+- Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12)
+
 -------------------------------------------------------------------
 Tue Jan 24 16:28:37 CET 2012 - mvidner@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index bc10289..b9f0be8 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -15,23 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
+
 
 Name:           yast2-network
-Version:        2.22.2
+Version:        2.22.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        yast2-network-%{version}.tar.bz2
 
+Group:          System/YaST
+License:        GPL-2.0+
 # should be required by devtools
-BuildRequires:  perl-XML-Writer
-BuildRequires:  pkgconfig
-BuildRequires:  rpm
+BuildRequires:  perl-XML-Writer pkgconfig rpm
 BuildRequires:  update-desktop-files
+BuildRequires:  yast2-devtools yast2-testsuite
 BuildRequires:  yast2-country
-BuildRequires:  yast2-devtools
 BuildRequires:  yast2-installation >= 2.15.27
-BuildRequires:  yast2-testsuite
 
 # NetworkInterfaces::Write should write ifcfgs only once
 # Wizard::SetDesktopTitleAndIcon
@@ -62,12 +63,10 @@ Obsoletes:      y2t_lan y2t_adsl y2t_dial
 Conflicts:      yast2-core < 2.10.6
 
 Summary:        YaST2 - Network Configuration
-License:        GPL-2.0+
-Group:          System/YaST
 
 %package devel-doc
-Summary:        YaST2 - Developer documentation for yast2-network
 Group:          System/YaST
+Summary:        YaST2 - Developer documentation for yast2-network
 
 %description 
 This package contains the YaST2 component for network configuration.
@@ -86,6 +85,7 @@ autoreconf --force --install
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 
+%{?suse_update_config:%{suse_update_config -f}}
 ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works