From cca407eee40191d4f97910ef72e0c5129b400c66a414b1a7262ac3c5666ccabd Mon Sep 17 00:00:00 2001
From: Michal Zugec <mzugec@novell.com>
Date: Tue, 20 Oct 2009 09:31:27 +0000
Subject: [PATCH 1/5] 2,14d1 < Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz <
 < - for wlan require iw instead of wireless-tools (bnc#539669) < - 2.18.51 <
 < ------------------------------------------------------------------- < Thu
 Oct  1 16:46:02 CEST 2009 - mzugec@suse.cz < < - YaPI: return map with return
 code and error message in Write <  function + testsuite < - 2.18.50 < <
 -------------------------------------------------------------------

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

diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000
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-2.18.51.tar.bz2 b/yast2-network-2.18.51.tar.bz2
new file mode 100644
index 0000000..8d6d927
--- /dev/null
+++ b/yast2-network-2.18.51.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:445c2f07912009fc6f59d0e5d0c1edbfce07a669a9bec8afb4eb1499c401c078
+size 335769
diff --git a/yast2-network.changes b/yast2-network.changes
index 6bab94d..ee64500 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz
+
+- for wlan require iw instead of wireless-tools (bnc#539669)
+- 2.18.51 
+
+-------------------------------------------------------------------
+Thu Oct  1 16:46:02 CEST 2009 - mzugec@suse.cz
+
+- YaPI: return map with return code and error message in Write
+ function + testsuite
+- 2.18.50 
+
 -------------------------------------------------------------------
 Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index d574078..9183e26 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,62 +1,56 @@
 #
-# spec file for package yast2-network (Version 2.18.49)
+# spec file for package yast2-network (Version 2.18.51)
 #
-# 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.51
+Release:	0
 
-Name:           yast2-network
-Version:        2.18.49
-Release:        1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.49.tar.bz2
-Prefix:         /usr
-Group:          System/YaST
-License:        GPL v2 or later
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-network-2.18.51.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.
@@ -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.18.49
+%setup -n yast2-network-2.18.51
 
 %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

From 90ee5c06410c9687ec72e0e1146280ffed3a3870d4125f87cdf5b02a7bf98240 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 21 Oct 2009 16:57:25 +0000
Subject: [PATCH 2/5] checked in

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

diff --git a/ready b/ready
new file mode 100644
index 0000000..473a0f4
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-2.18.51.tar.bz2 b/yast2-network-2.18.51.tar.bz2
deleted file mode 100644
index 8d6d927..0000000
--- a/yast2-network-2.18.51.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:445c2f07912009fc6f59d0e5d0c1edbfce07a669a9bec8afb4eb1499c401c078
-size 335769
diff --git a/yast2-network.changes b/yast2-network.changes
index ee64500..6bab94d 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz
-
-- for wlan require iw instead of wireless-tools (bnc#539669)
-- 2.18.51 
-
--------------------------------------------------------------------
-Thu Oct  1 16:46:02 CEST 2009 - mzugec@suse.cz
-
-- YaPI: return map with return code and error message in Write
- function + testsuite
-- 2.18.50 
-
 -------------------------------------------------------------------
 Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 9183e26..d574078 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,56 +1,62 @@
 #
-# spec file for package yast2-network (Version 2.18.51)
+# spec file for package yast2-network (Version 2.18.49)
 #
+# 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.51
-Release:	0
 
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.51.tar.bz2
-
-prefix:		/usr
-
-Group:	System/YaST
-License: GPL v2 or later
+Name:           yast2-network
+Version:        2.18.49
+Release:        1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        yast2-network-2.18.49.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.51
+%setup -n yast2-network-2.18.49
 
 %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 9a14d71129ccb6bd4046d926009de25903b7b2183d9705dc78a0176925ea353b Mon Sep 17 00:00:00 2001
From: Michal Zugec <mzugec@novell.com>
Date: Mon, 26 Oct 2009 15:05:01 +0000
Subject: [PATCH 3/5] 2,12d1 < Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz <
 < - show BusID in lan description (FaTE#307165) < - 2.18.52 < <
 ------------------------------------------------------------------- < Tue Oct
 20 13:20:12 CEST 2009 - mzugec@suse.cz < < - missing space in translated text
 (bnc#545074) < <
 -------------------------------------------------------------------

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

diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000
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-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2
new file mode 100644
index 0000000..cae8547
--- /dev/null
+++ b/yast2-network-2.18.52.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e
+size 300238
diff --git a/yast2-network.changes b/yast2-network.changes
index 6bab94d..f184d08 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz
+
+- show BusID in lan description (FaTE#307165)
+- 2.18.52 
+
+-------------------------------------------------------------------
+Tue Oct 20 13:20:12 CEST 2009 - mzugec@suse.cz
+
+- missing space in translated text (bnc#545074) 
+
+-------------------------------------------------------------------
+Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz
+
+- for wlan require iw instead of wireless-tools (bnc#539669)
+- 2.18.51 
+
+-------------------------------------------------------------------
+Thu Oct  1 16:46:02 CEST 2009 - mzugec@suse.cz
+
+- YaPI: return map with return code and error message in Write
+ function + testsuite
+- 2.18.50 
+
 -------------------------------------------------------------------
 Fri Sep 25 17:50:03 CEST 2009 - kmachalkova@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index d574078..666868c 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,62 +1,56 @@
 #
-# spec file for package yast2-network (Version 2.18.49)
+# spec file for package yast2-network (Version 2.18.52)
 #
-# 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.52
+Release:	0
 
-Name:           yast2-network
-Version:        2.18.49
-Release:        1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.49.tar.bz2
-Prefix:         /usr
-Group:          System/YaST
-License:        GPL v2 or later
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-network-2.18.52.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.
@@ -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.18.49
+%setup -n yast2-network-2.18.52
 
 %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

From 2a0f0553537f3a380d0d00780e33b6bf67d84ba4217ab5b729f16fafd29eadd6 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 26 Oct 2009 16:23:01 +0000
Subject: [PATCH 4/5] checked in

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

diff --git a/ready b/ready
new file mode 100644
index 0000000..473a0f4
diff --git a/yast2-network-2.18.51.tar.bz2 b/yast2-network-2.18.51.tar.bz2
new file mode 100644
index 0000000..8d6d927
--- /dev/null
+++ b/yast2-network-2.18.51.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:445c2f07912009fc6f59d0e5d0c1edbfce07a669a9bec8afb4eb1499c401c078
+size 335769
diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2
deleted file mode 100644
index cae8547..0000000
--- a/yast2-network-2.18.52.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e
-size 300238
diff --git a/yast2-network.changes b/yast2-network.changes
index f184d08..ee64500 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz
-
-- show BusID in lan description (FaTE#307165)
-- 2.18.52 
-
--------------------------------------------------------------------
-Tue Oct 20 13:20:12 CEST 2009 - mzugec@suse.cz
-
-- missing space in translated text (bnc#545074) 
-
 -------------------------------------------------------------------
 Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index 666868c..c680374 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,56 +1,62 @@
 #
-# spec file for package yast2-network (Version 2.18.52)
+# spec file for package yast2-network (Version 2.18.51)
 #
+# 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.52
-Release:	0
 
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-network-2.18.52.tar.bz2
-
-prefix:		/usr
-
-Group:	System/YaST
-License: GPL v2 or later
+Name:           yast2-network
+Version:        2.18.51
+Release:        1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        yast2-network-2.18.51.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.52
+%setup -n yast2-network-2.18.51
 
 %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 9b0c75848837fffae3b763fa17e3729c8cc6c10ee7f4eeda93468a2a45b277be Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 26 Oct 2009 16:23:02 +0000
Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/yast2-network
 revision 194.0

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

diff --git a/yast2-network-2.18.51.tar.bz2 b/yast2-network-2.18.51.tar.bz2
deleted file mode 100644
index 8d6d927..0000000
--- a/yast2-network-2.18.51.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:445c2f07912009fc6f59d0e5d0c1edbfce07a669a9bec8afb4eb1499c401c078
-size 335769
diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2
new file mode 100644
index 0000000..cae8547
--- /dev/null
+++ b/yast2-network-2.18.52.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e
+size 300238
diff --git a/yast2-network.changes b/yast2-network.changes
index ee64500..f184d08 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz
+
+- show BusID in lan description (FaTE#307165)
+- 2.18.52 
+
+-------------------------------------------------------------------
+Tue Oct 20 13:20:12 CEST 2009 - mzugec@suse.cz
+
+- missing space in translated text (bnc#545074) 
+
 -------------------------------------------------------------------
 Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index c680374..ec845f8 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-network (Version 2.18.51)
+# spec file for package yast2-network (Version 2.18.52)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,10 +19,10 @@
 
 
 Name:           yast2-network
-Version:        2.18.51
+Version:        2.18.52
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.18.51.tar.bz2
+Source0:        yast2-network-2.18.52.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.51
+%setup -n yast2-network-2.18.52
 
 %build
 %{prefix}/bin/y2tool y2autoconf