diff --git a/yast2-network-2.21.1.tar.bz2 b/yast2-network-2.21.1.tar.bz2 deleted file mode 100644 index db13f25..0000000 --- a/yast2-network-2.21.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a9f4fc30c739c680584b4508ee29b5b13e1f156c38374f812d4971958e11569 -size 295182 diff --git a/yast2-network-2.21.2.tar.bz2 b/yast2-network-2.21.2.tar.bz2 new file mode 100644 index 0000000..d602410 --- /dev/null +++ b/yast2-network-2.21.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0cff27027c2c1f3348a3b8103387b2816e2db40f2ca69a17d283580ec62e855 +size 294959 diff --git a/yast2-network.changes b/yast2-network.changes index 38aa8c8..0aeae5b 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 11 16:33:26 CEST 2011 - mvidner@suse.cz + +- Omit unnecessary INTERFACETYPE declaration in ifcfg (bnc#711762) + This broke the VM-proposed bridge because it copied ifcfg-ethN's + INTERFACETYPE=eth (bnc#704999). +- 2.21.2 + +------------------------------------------------------------------- +Fri Aug 5 12:34:09 CEST 2011 - tgoettlicher@suse.de + +- fixed .desktop file (bnc #681249) + ------------------------------------------------------------------- Wed Aug 3 17:09:21 CEST 2011 - mvidner@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index e5c7a21..8a2fd6d 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,72 +1,57 @@ # -# spec file for package yast2-network +# spec file for package yast2-network (Version 2.21.2) # -# 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.2 +Release: 0 -Name: yast2-network -Version: 2.21.1 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.21.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.21.2.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 +BuildRequires: yast2 >= 2.21.6 +Requires: yast2 >= 2.21.6 #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. @@ -75,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.1 +%setup -n yast2-network-2.21.2 %build %{prefix}/bin/y2tool y2autoconf @@ -145,5 +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