diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000
diff --git a/yast2-network-2.19.5.tar.bz2 b/yast2-network-2.19.5.tar.bz2
deleted file mode 100644
index 28023b6..0000000
--- a/yast2-network-2.19.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6a64457a4c397fcbd3ede69c8d98b136c17448dfe09c8cf1b9d5e8b18d100ea
-size 314281
diff --git a/yast2-network-2.19.6.tar.bz2 b/yast2-network-2.19.6.tar.bz2
new file mode 100644
index 0000000..81cbd14
--- /dev/null
+++ b/yast2-network-2.19.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21e72b2256e9411969473b8ee2cae7e4c4ee7eb79f7445ae51d14d2c8fd841ce
+size 327568
diff --git a/yast2-network.changes b/yast2-network.changes
index 2f14d10..096ae1e 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jan 14 17:59:48 CET 2010 - mzugec@suse.cz
+
+- support for BOOTPROTO=ibft option (bnc#551380)
+- 2.19.6
+
+------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+ where root privileges are needed, removed X-KDE-SubstituteUID key
+ (bnc#540627)
+
-------------------------------------------------------------------
Wed Dec 16 15:59:25 CET 2009 - mzugec@suse.cz
diff --git a/yast2-network.spec b/yast2-network.spec
index b2f9e68..a8060cd 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,62 +1,56 @@
#
-# spec file for package yast2-network (Version 2.19.5)
+# spec file for package yast2-network (Version 2.19.6)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
# norootforbuild
+Name: yast2-network
+Version: 2.19.6
+Release: 0
-Name: yast2-network
-Version: 2.19.5
-Release: 1
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.19.5.tar.bz2
-Prefix: /usr
-Group: System/YaST
-License: GPLv2+
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0: yast2-network-2.19.6.tar.bz2
+
+prefix: /usr
+
+Group: System/YaST
+License: GPL v2 or later
# should be required by devtools
-BuildRequires: perl-XML-Writer pkgconfig rpm
-BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools yast2-testsuite
-BuildRequires: yast2-country
-BuildRequires: yast2-installation >= 2.15.27
-BuildRequires: yast2 >= 2.16.6
-# ProductControl::Disable* - yast2-2.18.23
-Requires: yast2 >= 2.18.23
+BuildRequires: pkgconfig perl-XML-Writer rpm
+BuildRequires: update-desktop-files
+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
#netconfig (FaTE #303618)
-Requires: sysconfig >= 0.71.2
+Requires: sysconfig >= 0.71.2
#GetLanguageCountry
#(in newly created yast2-country-data)
-Requires: yast2-country-data >= 2.16.3
-PreReq: /bin/rm
-Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
-Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
-Provides: yast2-lib-network yast2-config-network
-Obsoletes: yast2-lib-network yast2-config-network
-Provides: yast2-trans-network yast2-trans-adsl
-Obsoletes: yast2-trans-network yast2-trans-adsl
-Provides: y2t_lan y2t_adsl y2t_dial
-Obsoletes: y2t_lan y2t_adsl y2t_dial
+Requires: yast2-country-data >= 2.16.3
+
+PreReq: /bin/rm
+
+Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
+Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
+Provides: yast2-lib-network yast2-config-network
+Obsoletes: yast2-lib-network yast2-config-network
+Provides: yast2-trans-network yast2-trans-adsl
+Obsoletes: yast2-trans-network yast2-trans-adsl
+Provides: y2t_lan y2t_adsl y2t_dial
+Obsoletes: y2t_lan y2t_adsl y2t_dial
+
# carrier detection
-Conflicts: yast2-core < 2.10.6
-Summary: YaST2 - Network Configuration
+Conflicts: yast2-core < 2.10.6
+
+Summary: YaST2 - Network Configuration
%package devel-doc
-License: GPLv2+
Group: System/YaST
-Summary: YaST2 - Developer documentation for yast2-network
+Summary: YaST2 - Developer documentation for yast2-network
+
%description
This package contains the YaST2 component for network configuration.
@@ -65,14 +59,16 @@ This package contains the YaST2 component for network configuration.
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.19.5
+%setup -n yast2-network-2.19.6
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
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)
@@ -86,6 +82,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
+
%ifarch s390 s390x
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/dsl.desktop
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop
@@ -122,6 +119,7 @@ fi
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
+
%dir %{prefix}/share/doc/packages/yast2-network
%{prefix}/share/doc/packages/yast2-network/COPYING
%readme %{prefix}/share/doc/packages/yast2-network/README
@@ -131,4 +129,3 @@ fi
%doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
-%changelog