From 25d1e337b74bd24b4630dfd365300c210c3026f6da4ef8769badde374712213f Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 13 Apr 2010 11:31:27 +0000 Subject: [PATCH 1/2] 2,25d1 < Tue Apr 13 13:18:57 CEST 2010 - mzugec@suse.cz < < - allow vlan on top of bonding device (bnc#591835) < - 2.19.22 < < ------------------------------------------------------------------- < Tue Apr 13 12:41:59 CEST 2010 - mzugec@suse.cz < < - proxy: "/" character validation (bnc#566350) < - 2.19.21 < < ------------------------------------------------------------------- < Tue Mar 30 16:17:10 CEST 2010 - mzugec@suse.cz < < - added exception to filter out virtio semi-device (bnc#585506) < - 2.19.20 < < ------------------------------------------------------------------- < Tue Mar 30 14:02:10 CEST 2010 - mzugec@suse.cz < < - remove aliases from automatically bridged device (bnc#590167) < - 2.19.19 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=79 --- yast2-network-2.19.18.tar.bz2 | 3 -- yast2-network-2.19.22.tar.bz2 | 3 ++ yast2-network.changes | 24 +++++++++++ yast2-network.changes.rej | 14 +++++++ yast2-network.spec | 79 ++++++++++++++--------------------- 5 files changed, 73 insertions(+), 50 deletions(-) delete mode 100644 yast2-network-2.19.18.tar.bz2 create mode 100644 yast2-network-2.19.22.tar.bz2 create mode 100644 yast2-network.changes.rej diff --git a/yast2-network-2.19.18.tar.bz2 b/yast2-network-2.19.18.tar.bz2 deleted file mode 100644 index 1b58175..0000000 --- a/yast2-network-2.19.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:919c75f4814d2c12b5d3f21a3fffe0201fd6f07d4a3942f78b125d5e2e871c7e -size 314976 diff --git a/yast2-network-2.19.22.tar.bz2 b/yast2-network-2.19.22.tar.bz2 new file mode 100644 index 0000000..ff46dab --- /dev/null +++ b/yast2-network-2.19.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34f7f457b0d1d9da38e15746ca28c1cea7d3959d580add333629b5157509e685 +size 370543 diff --git a/yast2-network.changes b/yast2-network.changes index a76c5af..9e2c94d 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Apr 13 13:18:57 CEST 2010 - mzugec@suse.cz + +- allow vlan on top of bonding device (bnc#591835) +- 2.19.22 + +------------------------------------------------------------------- +Tue Apr 13 12:41:59 CEST 2010 - mzugec@suse.cz + +- proxy: "/" character validation (bnc#566350) +- 2.19.21 + +------------------------------------------------------------------- +Tue Mar 30 16:17:10 CEST 2010 - mzugec@suse.cz + +- added exception to filter out virtio semi-device (bnc#585506) +- 2.19.20 + +------------------------------------------------------------------- +Tue Mar 30 14:02:10 CEST 2010 - mzugec@suse.cz + +- remove aliases from automatically bridged device (bnc#590167) +- 2.19.19 + ------------------------------------------------------------------- Wed Mar 24 15:10:33 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej new file mode 100644 index 0000000..8ffa623 --- /dev/null +++ b/yast2-network.changes.rej @@ -0,0 +1,14 @@ +--- package/yast2-network.changes (revision 61679) ++++ package/yast2-network.changes (working copy) +@@ -1,4 +1,11 @@ + ------------------------------------------------------------------- ++Tue Apr 13 13:09:49 CEST 2010 - mzugec@suse.cz ++ ++- allow vlan on top of bonding device (bnc#591835) ++- allow vlan on top of bridge device (bnc#587129) ++- 2.17.134 ++ ++------------------------------------------------------------------- + Tue Apr 13 12:34:15 CEST 2010 - mzugec@suse.cz + + - proxy: "/" character validation (bnc#566350) diff --git a/yast2-network.spec b/yast2-network.spec index dd09c13..98b4086 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # -# spec file for package yast2-network (Version 2.19.18) +# 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.18 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.18.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. @@ -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.19.18 +%setup -n yast2-network-2.19.22 %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 From c3519f2dd51c55a4ec4d8914b5ca1c8a139f4766c07333e5e3b3efb3dd43befe Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 16 Apr 2010 00:03:47 +0000 Subject: [PATCH 2/2] Accepting request 37857 from YaST:Head checked in (request 37857) OBS-URL: https://build.opensuse.org/request/show/37857 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=80 --- 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 8ffa623..0000000 --- a/yast2-network.changes.rej +++ /dev/null @@ -1,14 +0,0 @@ ---- package/yast2-network.changes (revision 61679) -+++ package/yast2-network.changes (working copy) -@@ -1,4 +1,11 @@ - ------------------------------------------------------------------- -+Tue Apr 13 13:09:49 CEST 2010 - mzugec@suse.cz -+ -+- allow vlan on top of bonding device (bnc#591835) -+- allow vlan on top of bridge device (bnc#587129) -+- 2.17.134 -+ -+------------------------------------------------------------------- - Tue Apr 13 12:34:15 CEST 2010 - mzugec@suse.cz - - - proxy: "/" character validation (bnc#566350) diff --git a/yast2-network.spec b/yast2-network.spec index 98b4086..c9d8303 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # # 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: 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