From d290278227380a5dc76338f8a08fd55be75af63ce5901ab37b20b6c2cc38a747 Mon Sep 17 00:00:00 2001
From: Michal Zugec <mzugec@novell.com>
Date: Thu, 17 Sep 2009 07:54:27 +0000
Subject: [PATCH 1/7] 2,13d1 < Wed Sep 16 14:53:15 CEST 2009 - mzugec@suse.cz <
 < - YaPI: write all values (included interfaces) < - 2.18.47 < <
 ------------------------------------------------------------------- < Fri Sep
 11 15:31:27 CEST 2009 - mzugec@suse.cz < < - YaPI: possible to remove default
 GW (bnc#538397) < - 2.18.46 < <
 -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=28
---
 ready              |  0
 yast2-network.spec | 87 ++++++++++++++++++++++------------------------
 2 files changed, 42 insertions(+), 45 deletions(-)
 delete mode 100644 ready

diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000
diff --git a/yast2-network.spec b/yast2-network.spec
index afa0860..8494dad 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,62 +1,56 @@
 #
 # spec file for package yast2-network (Version 2.18.47)
 #
-# 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.18.47
+Release:	0
 
-Name:           yast2-network
-Version:        2.18.47
-Release:        1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.47.tar.bz2
-Prefix:         /usr
-Group:          System/YaST
-License:        GPL v2 or later
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-network-2.18.47.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
+BuildRequires: pkgconfig perl-XML-Writer 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
+Requires:	yast2 >= 2.18.23
 #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:        GPL v2 or later
 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.
@@ -71,8 +65,10 @@ This package contains autogenerated documentation for yast2-network
 %{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

From 63b06f3a0b6bf210b63abc8adf7321a3d2caf681c70f786e6afa60387d1fd097 Mon Sep 17 00:00:00 2001
From: Martin Vidner <mvidner@suse.com>
Date: Fri, 18 Sep 2009 22:31:34 +0000
Subject: [PATCH 2/7] - replace STARTMODE='onboot' (which is deprecated) with
 'auto'  (bnc#533818) - 2.18.48

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

diff --git a/yast2-network-2.18.47.tar.bz2 b/yast2-network-2.18.47.tar.bz2
deleted file mode 100644
index 1e833cd..0000000
--- a/yast2-network-2.18.47.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:512b6c6eee508a0d00834d5b3e392abde64bda449d600f38f55b1edf89bc97c5
-size 333917
diff --git a/yast2-network-2.18.48.tar.bz2 b/yast2-network-2.18.48.tar.bz2
new file mode 100644
index 0000000..bbfc77a
--- /dev/null
+++ b/yast2-network-2.18.48.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddddf833ff1eeabcff1d3b429395ac10fe51f1a1731d8f31d1c6984e84a0d313
+size 285707
diff --git a/yast2-network.changes b/yast2-network.changes
index c6728f8..897b02e 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 17 13:37:54 CEST 2009 - mzugec@suse.cz
+
+- replace STARTMODE='onboot' (which is deprecated) with 'auto'
+ (bnc#533818)
+- 2.18.48 
+
 -------------------------------------------------------------------
 Wed Sep 16 14:53:15 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 8494dad..79c2805 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,15 +1,15 @@
 #
-# spec file for package yast2-network (Version 2.18.47)
+# spec file for package yast2-network (Version 2.18.48)
 #
 # norootforbuild
 
 Name:		yast2-network
-Version:	2.18.47
+Version:	2.18.48
 Release:	0
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.47.tar.bz2
+Source0:	yast2-network-2.18.48.tar.bz2
 
 prefix:		/usr
 
@@ -59,7 +59,7 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.18.47
+%setup -n yast2-network-2.18.48
 
 %build
 %{prefix}/bin/y2tool y2autoconf

From c445586375b4e40bb4481ccbaa05907946151da85d8880dc8a99dd21fa3c67d2 Mon Sep 17 00:00:00 2001
From: Katarina Machalkova <kmachalkova@novell.com>
Date: Fri, 25 Sep 2009 17:18:19 +0000
Subject: [PATCH 3/7] Fixed .spec file

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=30
---
 yast2-network-2.18.47.tar.bz2 |  3 ++
 yast2-network-2.18.48.tar.bz2 |  3 --
 yast2-network.spec            | 89 ++++++++++++++++++-----------------
 3 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 yast2-network-2.18.47.tar.bz2
 delete mode 100644 yast2-network-2.18.48.tar.bz2

diff --git a/yast2-network-2.18.47.tar.bz2 b/yast2-network-2.18.47.tar.bz2
new file mode 100644
index 0000000..1e833cd
--- /dev/null
+++ b/yast2-network-2.18.47.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:512b6c6eee508a0d00834d5b3e392abde64bda449d600f38f55b1edf89bc97c5
+size 333917
diff --git a/yast2-network-2.18.48.tar.bz2 b/yast2-network-2.18.48.tar.bz2
deleted file mode 100644
index bbfc77a..0000000
--- a/yast2-network-2.18.48.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ddddf833ff1eeabcff1d3b429395ac10fe51f1a1731d8f31d1c6984e84a0d313
-size 285707
diff --git a/yast2-network.spec b/yast2-network.spec
index 79c2805..defca3d 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,56 +1,62 @@
 #
-# spec file for package yast2-network (Version 2.18.48)
+# spec file for package yast2-network (Version 2.18.47)
 #
+# 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.18.48
-Release:	0
 
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.48.tar.bz2
-
-prefix:		/usr
-
-Group:	System/YaST
-License: GPL v2 or later
+Name:           yast2-network
+Version:        2.18.48
+Release:        1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        yast2-network-2.18.48.tar.bz2
+Prefix:         /usr
+Group:          System/YaST
+License:        GPL v2 or later
 # should be required by devtools
-BuildRequires: pkgconfig perl-XML-Writer rpm
-BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools yast2-testsuite
-BuildRequires: yast2-country
-BuildRequires: yast2-installation >= 2.15.27
-BuildRequires: yast2 >= 2.16.6
-
+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
+Requires:       yast2 >= 2.18.23
 #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:        GPL v2 or later
 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,10 +71,8 @@ This package contains autogenerated documentation for yast2-network
 %{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)
@@ -82,7 +86,6 @@ 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
@@ -119,7 +122,6 @@ 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
@@ -129,3 +131,4 @@ 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

From b0f186b0957ec2d621a06a677b19504c77f5d1007cbeda0a5ac3788d6d4698df Mon Sep 17 00:00:00 2001
From: Michal Zugec <mzugec@novell.com>
Date: Fri, 25 Sep 2009 17:19:07 +0000
Subject: [PATCH 4/7] 2,9d1 < Thu Sep 24 18:37:03 CEST 2009 -
 kmachalkova@suse.cz < < - Propose opening SSH port in firewall in SSH
 installation <   (bnc#535206) < - Enable SSH service if SSH port in firewall
 is to be opened <   (bnc#537980) < <
 -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=31
---
 yast2-network-2.18.47.tar.bz2 |  3 --
 yast2-network-2.18.48.tar.bz2 |  3 ++
 yast2-network.changes         |  8 ++++
 yast2-network.spec            | 89 +++++++++++++++++------------------
 4 files changed, 54 insertions(+), 49 deletions(-)
 delete mode 100644 yast2-network-2.18.47.tar.bz2
 create mode 100644 yast2-network-2.18.48.tar.bz2

diff --git a/yast2-network-2.18.47.tar.bz2 b/yast2-network-2.18.47.tar.bz2
deleted file mode 100644
index 1e833cd..0000000
--- a/yast2-network-2.18.47.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:512b6c6eee508a0d00834d5b3e392abde64bda449d600f38f55b1edf89bc97c5
-size 333917
diff --git a/yast2-network-2.18.48.tar.bz2 b/yast2-network-2.18.48.tar.bz2
new file mode 100644
index 0000000..90aac97
--- /dev/null
+++ b/yast2-network-2.18.48.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6182b9456a8728c6bd5f050b9cb595862c12ff01c4b518b3205e8757487fb343
+size 335046
diff --git a/yast2-network.changes b/yast2-network.changes
index 897b02e..e97b11f 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 24 18:37:03 CEST 2009 - kmachalkova@suse.cz
+
+- Propose opening SSH port in firewall in SSH installation 
+  (bnc#535206)
+- Enable SSH service if SSH port in firewall is to be opened 
+  (bnc#537980)  
+
 -------------------------------------------------------------------
 Thu Sep 17 13:37:54 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index defca3d..79c2805 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,62 +1,56 @@
 #
-# spec file for package yast2-network (Version 2.18.47)
+# spec file for package yast2-network (Version 2.18.48)
 #
-# 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.18.48
+Release:	0
 
-Name:           yast2-network
-Version:        2.18.48
-Release:        1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.48.tar.bz2
-Prefix:         /usr
-Group:          System/YaST
-License:        GPL v2 or later
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-network-2.18.48.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
+BuildRequires: pkgconfig perl-XML-Writer 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
+Requires:	yast2 >= 2.18.23
 #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:        GPL v2 or later
 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.
@@ -71,8 +65,10 @@ This package contains autogenerated documentation for yast2-network
 %{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

From c4f42113fbd4cf3933f4eb5c9b03fefc1d1d0fb7a569dbcd506b79e8e4d44a33 Mon Sep 17 00:00:00 2001
From: Katarina Machalkova <kmachalkova@novell.com>
Date: Fri, 25 Sep 2009 17:22:48 +0000
Subject: [PATCH 5/7] 2,8d1 < Fri Sep 25 17:50:03 CEST 2009 -
 kmachalkova@suse.cz < < - Display simple firewall & SSH config dialog after
 clicking on <   'Firewall' headline in initial proposal (bnc#539289) < -
 2.18.49 < <
 -------------------------------------------------------------------

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

diff --git a/yast2-network-2.18.48.tar.bz2 b/yast2-network-2.18.48.tar.bz2
deleted file mode 100644
index 90aac97..0000000
--- a/yast2-network-2.18.48.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6182b9456a8728c6bd5f050b9cb595862c12ff01c4b518b3205e8757487fb343
-size 335046
diff --git a/yast2-network-2.18.49.tar.bz2 b/yast2-network-2.18.49.tar.bz2
new file mode 100644
index 0000000..ec8f9dc
--- /dev/null
+++ b/yast2-network-2.18.49.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:253aa9833874cf3bdffdd6d186af1988705821703351c1677c72f298e985af70
+size 290002
diff --git a/yast2-network.changes b/yast2-network.changes
index e97b11f..6bab94d 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
+
+- Display simple firewall & SSH config dialog after clicking on
+  'Firewall' headline in initial proposal (bnc#539289)
+- 2.18.49 
+
 -------------------------------------------------------------------
 Thu Sep 24 18:37:03 CEST 2009 - kmachalkova@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 79c2805..28a9a42 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,15 +1,15 @@
 #
-# spec file for package yast2-network (Version 2.18.48)
+# spec file for package yast2-network (Version 2.18.49)
 #
 # norootforbuild
 
 Name:		yast2-network
-Version:	2.18.48
+Version:	2.18.49
 Release:	0
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.48.tar.bz2
+Source0:	yast2-network-2.18.49.tar.bz2
 
 prefix:		/usr
 
@@ -59,7 +59,7 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.18.48
+%setup -n yast2-network-2.18.49
 
 %build
 %{prefix}/bin/y2tool y2autoconf

From 49c28400cc3ab0a7e9972a6835f06b02cbe5233f817c679b4dcfe73668206519 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Sat, 26 Sep 2009 22:23:09 +0000
Subject: [PATCH 6/7] checked in

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=33
---
 ready                         |  0
 yast2-network-2.18.47.tar.bz2 |  3 ++
 yast2-network-2.18.49.tar.bz2 |  3 --
 yast2-network.changes         | 22 ---------
 yast2-network.spec            | 91 ++++++++++++++++++-----------------
 5 files changed, 50 insertions(+), 69 deletions(-)
 create mode 100644 ready
 create mode 100644 yast2-network-2.18.47.tar.bz2
 delete mode 100644 yast2-network-2.18.49.tar.bz2

diff --git a/ready b/ready
new file mode 100644
index 0000000..473a0f4
diff --git a/yast2-network-2.18.47.tar.bz2 b/yast2-network-2.18.47.tar.bz2
new file mode 100644
index 0000000..1e833cd
--- /dev/null
+++ b/yast2-network-2.18.47.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:512b6c6eee508a0d00834d5b3e392abde64bda449d600f38f55b1edf89bc97c5
+size 333917
diff --git a/yast2-network-2.18.49.tar.bz2 b/yast2-network-2.18.49.tar.bz2
deleted file mode 100644
index ec8f9dc..0000000
--- a/yast2-network-2.18.49.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:253aa9833874cf3bdffdd6d186af1988705821703351c1677c72f298e985af70
-size 290002
diff --git a/yast2-network.changes b/yast2-network.changes
index 6bab94d..c6728f8 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,25 +1,3 @@
--------------------------------------------------------------------
-Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
-
-- Display simple firewall & SSH config dialog after clicking on
-  'Firewall' headline in initial proposal (bnc#539289)
-- 2.18.49 
-
--------------------------------------------------------------------
-Thu Sep 24 18:37:03 CEST 2009 - kmachalkova@suse.cz
-
-- Propose opening SSH port in firewall in SSH installation 
-  (bnc#535206)
-- Enable SSH service if SSH port in firewall is to be opened 
-  (bnc#537980)  
-
--------------------------------------------------------------------
-Thu Sep 17 13:37:54 CEST 2009 - mzugec@suse.cz
-
-- replace STARTMODE='onboot' (which is deprecated) with 'auto'
- (bnc#533818)
-- 2.18.48 
-
 -------------------------------------------------------------------
 Wed Sep 16 14:53:15 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 28a9a42..afa0860 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,56 +1,62 @@
 #
-# spec file for package yast2-network (Version 2.18.49)
+# spec file for package yast2-network (Version 2.18.47)
 #
+# 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.18.49
-Release:	0
 
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.49.tar.bz2
-
-prefix:		/usr
-
-Group:	System/YaST
-License: GPL v2 or later
+Name:           yast2-network
+Version:        2.18.47
+Release:        1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        yast2-network-2.18.47.tar.bz2
+Prefix:         /usr
+Group:          System/YaST
+License:        GPL v2 or later
 # should be required by devtools
-BuildRequires: pkgconfig perl-XML-Writer rpm
-BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools yast2-testsuite
-BuildRequires: yast2-country
-BuildRequires: yast2-installation >= 2.15.27
-BuildRequires: yast2 >= 2.16.6
-
+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
+Requires:       yast2 >= 2.18.23
 #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:        GPL v2 or later
 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.
@@ -59,16 +65,14 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.18.49
+%setup -n yast2-network-2.18.47
 
 %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)
@@ -82,7 +86,6 @@ 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
@@ -119,7 +122,6 @@ 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
@@ -129,3 +131,4 @@ 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

From 82fdf7b47921f092f04c1f17e4c874d0e551cdb71d075c821f9176bf1cac1163 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Sat, 26 Sep 2009 22:23:11 +0000
Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/yast2-network
 revision 191.0

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=ba559f78ff87f92a51c07eb646cad578
---
 yast2-network-2.18.47.tar.bz2 |  3 ---
 yast2-network-2.18.49.tar.bz2 |  3 +++
 yast2-network.changes         | 22 ++++++++++++++++++++++
 yast2-network.spec            |  8 ++++----
 4 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 yast2-network-2.18.47.tar.bz2
 create mode 100644 yast2-network-2.18.49.tar.bz2

diff --git a/yast2-network-2.18.47.tar.bz2 b/yast2-network-2.18.47.tar.bz2
deleted file mode 100644
index 1e833cd..0000000
--- a/yast2-network-2.18.47.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:512b6c6eee508a0d00834d5b3e392abde64bda449d600f38f55b1edf89bc97c5
-size 333917
diff --git a/yast2-network-2.18.49.tar.bz2 b/yast2-network-2.18.49.tar.bz2
new file mode 100644
index 0000000..ec8f9dc
--- /dev/null
+++ b/yast2-network-2.18.49.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:253aa9833874cf3bdffdd6d186af1988705821703351c1677c72f298e985af70
+size 290002
diff --git a/yast2-network.changes b/yast2-network.changes
index c6728f8..6bab94d 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
+
+- Display simple firewall & SSH config dialog after clicking on
+  'Firewall' headline in initial proposal (bnc#539289)
+- 2.18.49 
+
+-------------------------------------------------------------------
+Thu Sep 24 18:37:03 CEST 2009 - kmachalkova@suse.cz
+
+- Propose opening SSH port in firewall in SSH installation 
+  (bnc#535206)
+- Enable SSH service if SSH port in firewall is to be opened 
+  (bnc#537980)  
+
+-------------------------------------------------------------------
+Thu Sep 17 13:37:54 CEST 2009 - mzugec@suse.cz
+
+- replace STARTMODE='onboot' (which is deprecated) with 'auto'
+ (bnc#533818)
+- 2.18.48 
+
 -------------------------------------------------------------------
 Wed Sep 16 14:53:15 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index afa0860..d574078 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-network (Version 2.18.47)
+# spec file for package yast2-network (Version 2.18.49)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,10 +19,10 @@
 
 
 Name:           yast2-network
-Version:        2.18.47
+Version:        2.18.49
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.47.tar.bz2
+Source0:        yast2-network-2.18.49.tar.bz2
 Prefix:         /usr
 Group:          System/YaST
 License:        GPL v2 or later
@@ -65,7 +65,7 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.18.47
+%setup -n yast2-network-2.18.49
 
 %build
 %{prefix}/bin/y2tool y2autoconf