From 823da7201b0f0a3eb687ec5f60e82aee16ea874af2132852a21966eee7e8ed2b Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Wed, 31 Aug 2011 14:50:23 +0000 Subject: [PATCH] - More YaPI improvements from Justus Winter: - Write: default BOOTPROTO to 'static', allow omitting IPADDR - Allow manipulating STARTMODE, don't assume 'auto'. - Handle ETHERDEVICE and VLAN_ID. - 2.21.5 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=147 --- yast2-network-2.21.4.tar.bz2 | 3 -- yast2-network-2.21.5.tar.bz2 | 3 ++ yast2-network.changes | 9 ++++ yast2-network.spec | 81 +++++++++++++++--------------------- 4 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 yast2-network-2.21.4.tar.bz2 create mode 100644 yast2-network-2.21.5.tar.bz2 diff --git a/yast2-network-2.21.4.tar.bz2 b/yast2-network-2.21.4.tar.bz2 deleted file mode 100644 index c4a6280..0000000 --- a/yast2-network-2.21.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d6de0905301d38978377aa2dfc83b2f6018378bde46a96bcaad4f53d2283166 -size 295290 diff --git a/yast2-network-2.21.5.tar.bz2 b/yast2-network-2.21.5.tar.bz2 new file mode 100644 index 0000000..20a509f --- /dev/null +++ b/yast2-network-2.21.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1186edc5f01d3789fc400cfdc5208df4b1d823e03a822088523004c8e8f6a089 +size 293965 diff --git a/yast2-network.changes b/yast2-network.changes index f210095..441dc7b 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 31 16:23:38 CEST 2011 - mvidner@suse.cz + +- More YaPI improvements from Justus Winter: + - Write: default BOOTPROTO to 'static', allow omitting IPADDR + - Allow manipulating STARTMODE, don't assume 'auto'. + - Handle ETHERDEVICE and VLAN_ID. +- 2.21.5 + ------------------------------------------------------------------- Wed Aug 17 15:02:50 CEST 2011 - mvidner@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 441e630..f6c88c5 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,71 +1,57 @@ # -# spec file for package yast2-network +# spec file for package yast2-network (Version 2.21.5) # -# Copyright (c) 2011 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.21.5 +Release: 0 -Name: yast2-network -Version: 2.21.4 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.21.4.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.21.5.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPL v2 or later +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 -# NetworkInterfaces::GetTypeFromIfcfg (bnc#572747) -BuildRequires: yast2 >= 2.21.6 -Requires: yast2 >= 2.21.6 +# NetworkInterfaces::Write should write ifcfgs only once +BuildRequires: yast2 >= 2.21.14 +Requires: yast2 >= 2.21.14 #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 - 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. @@ -74,7 +60,7 @@ This package contains the YaST2 component for network configuration. This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.21.4 +%setup -n yast2-network-2.21.5 %build %{prefix}/bin/y2tool y2autoconf @@ -144,4 +130,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