From 6db281db2ad8464509b3845c00a77bddee80e468167867b2e5452f5c50561039 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 11 Nov 2010 12:40:04 +0000 Subject: [PATCH 1/3] prepare_spec OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=126 --- yast2-network.spec | 75 +++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/yast2-network.spec b/yast2-network.spec index cbcb9fa..f81162b 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # # spec file for package yast2-network (Version 2.20.1) # +# 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.20.1 -Release: 0 +Name: yast2-network +Version: 2.20.1 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.20.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.20.1.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 From 93af6982e0e4e7dfda6b069fab33b5d2a8f102b736b253e0278ff02cf6824dce Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 11 Nov 2010 12:40:10 +0000 Subject: [PATCH 2/3] sync with O:F OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=127 --- yast2-network.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yast2-network.spec b/yast2-network.spec index f81162b..a9e6ea2 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -20,7 +20,7 @@ Name: yast2-network Version: 2.20.1 -Release: 0 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-network-2.20.1.tar.bz2 From da51f2c0af0fb108fe45e2a2004d6fec0d487807ccb7c9ef5ec273673c372f12 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 16 Nov 2010 10:34:47 +0000 Subject: [PATCH 3/3] 2,20d1 < Tue Nov 16 11:13:12 CET 2010 - mzugec@suse.cz < < - accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) < - 2.20.4 < < ------------------------------------------------------------------- < Mon Nov 15 12:37:29 CET 2010 - mzugec@suse.cz < < - correctly apply BusID based udev rules in AY (bnc#648270) < - 2.20.3 < < ------------------------------------------------------------------- < Mon Nov 8 15:28:20 CET 2010 - mzugec@suse.cz < < - TP-L3: if possible, for temporary installation network use same < device with same MAC address, even if devicename changed (bnc#648270) < - 2.20.2 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=128 --- yast2-network-2.20.1.tar.bz2 | 3 -- yast2-network-2.20.4.tar.bz2 | 3 ++ yast2-network.changes | 19 +++++++++ yast2-network.spec | 79 +++++++++++++++--------------------- 4 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 yast2-network-2.20.1.tar.bz2 create mode 100644 yast2-network-2.20.4.tar.bz2 diff --git a/yast2-network-2.20.1.tar.bz2 b/yast2-network-2.20.1.tar.bz2 deleted file mode 100644 index 2231450..0000000 --- a/yast2-network-2.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:666b3a426ff178e654ae06cf19e783dde8f03e714dab394439096fb5ef1b614e -size 316307 diff --git a/yast2-network-2.20.4.tar.bz2 b/yast2-network-2.20.4.tar.bz2 new file mode 100644 index 0000000..381bf52 --- /dev/null +++ b/yast2-network-2.20.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8531b4609b0f7fe07aa94b11127c2ff7482c5d718ba546a7edaf43f96bf150ba +size 289905 diff --git a/yast2-network.changes b/yast2-network.changes index 08f139e..033fdd3 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 16 11:13:12 CET 2010 - mzugec@suse.cz + +- accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) +- 2.20.4 + +------------------------------------------------------------------- +Mon Nov 15 12:37:29 CET 2010 - mzugec@suse.cz + +- correctly apply BusID based udev rules in AY (bnc#648270) +- 2.20.3 + +------------------------------------------------------------------- +Mon Nov 8 15:28:20 CET 2010 - mzugec@suse.cz + +- TP-L3: if possible, for temporary installation network use same +device with same MAC address, even if devicename changed (bnc#648270) +- 2.20.2 + ------------------------------------------------------------------- Wed Nov 3 17:03:37 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index a9e6ea2..d16a865 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # -# spec file for package yast2-network (Version 2.20.1) +# spec file for package yast2-network (Version 2.20.4) # -# 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.20.4 +Release: 0 -Name: yast2-network -Version: 2.20.1 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.20.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.20.4.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. @@ -73,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.20.1 +%setup -n yast2-network-2.20.4 %build %{prefix}/bin/y2tool y2autoconf @@ -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