From 515eff9121bf3f74763c261f3346dbeabf110329c28b30a148a6f7319122a0cd Mon Sep 17 00:00:00 2001 From: Katarina Machalkova Date: Fri, 16 Apr 2010 13:17:53 +0000 Subject: [PATCH 1/3] 2,13d1 < Fri Apr 16 13:02:10 UTC 2010 - kmachalkova@novell.com < < - Rollup patch with several Code11 bugfixes: < - Include in cloned data (bnc#576495) < - Don't check for presence of static IPs when deciding whether to < append 127.0.0.2 line to /etc/hosts < - Pre-fill hostname field with global hostname in static IP dialog < - Warn if no hostname is specified for static IP (all bnc#583786) < - In [auto]installation, prefer hostname from install.inf. Convert < to FQDN if it is an IP address (bnc#556613, bnc#502715) < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=81 --- yast2-network-2.19.22.tar.bz2 | 4 +- yast2-network.changes | 12 ++++++ yast2-network.spec | 75 ++++++++++++++--------------------- 3 files changed, 44 insertions(+), 47 deletions(-) diff --git a/yast2-network-2.19.22.tar.bz2 b/yast2-network-2.19.22.tar.bz2 index ff46dab..f8f430a 100644 --- a/yast2-network-2.19.22.tar.bz2 +++ b/yast2-network-2.19.22.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34f7f457b0d1d9da38e15746ca28c1cea7d3959d580add333629b5157509e685 -size 370543 +oid sha256:06f3fa223ebbf6e266580c3347ad0a79e287fce3d986c8fd1e0db9cf56fe243a +size 297236 diff --git a/yast2-network.changes b/yast2-network.changes index 9e2c94d..749adfa 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 16 13:02:10 UTC 2010 - kmachalkova@novell.com + +- Rollup patch with several Code11 bugfixes: + - Include in cloned data (bnc#576495) + - Don't check for presence of static IPs when deciding whether to + append 127.0.0.2 line to /etc/hosts + - Pre-fill hostname field with global hostname in static IP dialog + - Warn if no hostname is specified for static IP (all bnc#583786) + - In [auto]installation, prefer hostname from install.inf. Convert + to FQDN if it is an IP address (bnc#556613, bnc#502715) + ------------------------------------------------------------------- Tue Apr 13 13:18:57 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index c9d8303..98b4086 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # # spec file for package yast2-network (Version 2.19.22) # -# Copyright (c) 2010 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.22 +Release: 0 -Name: yast2-network -Version: 2.19.22 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.22.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.22.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPLv2+ +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: 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 +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 +Requires: yast2-country-data >= 2.16.3 -PreReq: /bin/rm +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 +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 +Conflicts: yast2-core < 2.10.6 -Summary: YaST2 - Network Configuration +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. @@ -143,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 7236ae15c4f8856f6ff210d15c81397a0a1a312d45e5603f23a51a4a4a360b6b Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Mon, 19 Apr 2010 13:33:17 +0000 Subject: [PATCH 2/3] 2,7d1 < Mon Apr 19 15:26:59 CEST 2010 - mzugec@suse.cz < < - CLI: respect netmask argument (bnc#584406) < - 2.19.23 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=82 --- yast2-network-2.19.22.tar.bz2 | 3 --- yast2-network-2.19.23.tar.bz2 | 3 +++ yast2-network.changes | 6 ++++++ yast2-network.changes.rej | 14 ++++++++++++++ yast2-network.spec | 8 ++++---- 5 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 yast2-network-2.19.22.tar.bz2 create mode 100644 yast2-network-2.19.23.tar.bz2 create mode 100644 yast2-network.changes.rej diff --git a/yast2-network-2.19.22.tar.bz2 b/yast2-network-2.19.22.tar.bz2 deleted file mode 100644 index f8f430a..0000000 --- a/yast2-network-2.19.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06f3fa223ebbf6e266580c3347ad0a79e287fce3d986c8fd1e0db9cf56fe243a -size 297236 diff --git a/yast2-network-2.19.23.tar.bz2 b/yast2-network-2.19.23.tar.bz2 new file mode 100644 index 0000000..104abfb --- /dev/null +++ b/yast2-network-2.19.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f466fdb6db5a1fcae1215011cb593fd19ae5a6fdac3e08dfef77d6e535eb52d +size 328312 diff --git a/yast2-network.changes b/yast2-network.changes index 749adfa..20b6f39 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 19 15:26:59 CEST 2010 - mzugec@suse.cz + +- CLI: respect netmask argument (bnc#584406) +- 2.19.23 + ------------------------------------------------------------------- Fri Apr 16 13:02:10 UTC 2010 - kmachalkova@novell.com diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej new file mode 100644 index 0000000..78fec43 --- /dev/null +++ b/yast2-network.changes.rej @@ -0,0 +1,14 @@ +--- package/yast2-network.changes (revision 61331) ++++ package/yast2-network.changes (working copy) +@@ -1,4 +1,11 @@ + ------------------------------------------------------------------- ++Wed Mar 17 09:05:30 CET 2010 - mzugec@suse.cz ++ ++- L3: in case of type different from config. name write INTERFACETYPE ++option (bnc#585458) ++- 2.17.128 ++ ++------------------------------------------------------------------- + Tue Mar 16 13:14:40 CET 2010 - mzugec@suse.cz + + - during 1st installation stage write correctly filename for ifcfg diff --git a/yast2-network.spec b/yast2-network.spec index 98b4086..ba821f2 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,15 +1,15 @@ # -# spec file for package yast2-network (Version 2.19.22) +# spec file for package yast2-network (Version 2.19.23) # # norootforbuild Name: yast2-network -Version: 2.19.22 +Version: 2.19.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.22.tar.bz2 +Source0: yast2-network-2.19.23.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.19.22 +%setup -n yast2-network-2.19.23 %build %{prefix}/bin/y2tool y2autoconf From ebf4fb6b265213bbe1ba4bb8a1d1acb3091f71baf9acb56e042ec31bdcdeb99f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Apr 2010 00:18:04 +0000 Subject: [PATCH 3/3] Accepting request 38223 from YaST:Head checked in (request 38223) OBS-URL: https://build.opensuse.org/request/show/38223 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=83 --- yast2-network.changes.rej | 14 -------- yast2-network.spec | 75 +++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 44 deletions(-) delete mode 100644 yast2-network.changes.rej diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej deleted file mode 100644 index 78fec43..0000000 --- a/yast2-network.changes.rej +++ /dev/null @@ -1,14 +0,0 @@ ---- package/yast2-network.changes (revision 61331) -+++ package/yast2-network.changes (working copy) -@@ -1,4 +1,11 @@ - ------------------------------------------------------------------- -+Wed Mar 17 09:05:30 CET 2010 - mzugec@suse.cz -+ -+- L3: in case of type different from config. name write INTERFACETYPE -+option (bnc#585458) -+- 2.17.128 -+ -+------------------------------------------------------------------- - Tue Mar 16 13:14:40 CET 2010 - mzugec@suse.cz - - - during 1st installation stage write correctly filename for ifcfg diff --git a/yast2-network.spec b/yast2-network.spec index ba821f2..12d8d51 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # # spec file for package yast2-network (Version 2.19.23) # +# Copyright (c) 2010 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.23 -Release: 0 +Name: yast2-network +Version: 2.19.23 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.23.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.23.tar.bz2 -prefix: /usr +Prefix: /usr -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPLv2+ # 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: perl-XML-Writer pkgconfig 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 +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 +Requires: yast2-country-data >= 2.16.3 -PreReq: /bin/rm +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 +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 +Conflicts: yast2-core < 2.10.6 -Summary: YaST2 - Network Configuration +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. @@ -129,3 +143,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