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
This commit is contained in:
OBS User autobuild 2010-04-16 00:03:47 +00:00 committed by Git OBS Bridge
parent 25d1e337b7
commit c3519f2dd5
2 changed files with 45 additions and 44 deletions

View File

@ -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)

View File

@ -1,56 +1,70 @@
# #
# spec file for package yast2-network (Version 2.19.22) # 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 # norootforbuild
Name: yast2-network
Version: 2.19.22
Release: 0
Name: yast2-network
Version: 2.19.22
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-2.19.22.tar.bz2 Source0: yast2-network-2.19.22.tar.bz2
prefix: /usr Prefix: /usr
Group: System/YaST Group: System/YaST
License: GPL v2 or later License: GPLv2+
# should be required by devtools # should be required by devtools
BuildRequires: pkgconfig perl-XML-Writer rpm BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-devtools yast2-testsuite
BuildRequires: yast2-country BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27 BuildRequires: yast2-installation >= 2.15.27
# NetworkStorage: adapt functions needed for iBFT (bnc#551380) # NetworkStorage: adapt functions needed for iBFT (bnc#551380)
BuildRequires: yast2 >= 2.19.3 BuildRequires: yast2 >= 2.19.3
Requires: yast2 >= 2.19.3 Requires: yast2 >= 2.19.3
#netconfig (FaTE #303618) #netconfig (FaTE #303618)
Requires: sysconfig >= 0.71.2 Requires: sysconfig >= 0.71.2
#GetLanguageCountry #GetLanguageCountry
#(in newly created yast2-country-data) #(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 Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
Obsoletes: 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 Provides: yast2-lib-network yast2-config-network
Obsoletes: yast2-lib-network yast2-config-network Obsoletes: yast2-lib-network yast2-config-network
Provides: yast2-trans-network yast2-trans-adsl Provides: yast2-trans-network yast2-trans-adsl
Obsoletes: yast2-trans-network yast2-trans-adsl Obsoletes: yast2-trans-network yast2-trans-adsl
Provides: y2t_lan y2t_adsl y2t_dial Provides: y2t_lan y2t_adsl y2t_dial
Obsoletes: y2t_lan y2t_adsl y2t_dial Obsoletes: y2t_lan y2t_adsl y2t_dial
# carrier detection # 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 %package devel-doc
License: GPLv2+
Group: System/YaST Group: System/YaST
Summary: YaST2 - Developer documentation for yast2-network Summary: YaST2 - Developer documentation for yast2-network
%description %description
This package contains the YaST2 component for network configuration. This package contains the YaST2 component for network configuration.
@ -129,3 +143,4 @@ fi
%doc %{prefix}/share/doc/packages/yast2-network %doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README %exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog