From ae2a544261a08630b9375a989ad1d3e925d7c6f37fa2741115b5278fba4d50bc Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 12 Aug 2011 08:21:07 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/yast2-network revision 238.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=afd33b8cff2e14894b73c1132df74921 --- yast2-network.spec | 77 +++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/yast2-network.spec b/yast2-network.spec index 8a2fd6d..365fc13 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,57 +1,71 @@ # -# spec file for package yast2-network (Version 2.21.2) +# spec file for package yast2-network # +# 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.2 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.21.2.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: 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 # 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 +Group: System/YaST +Summary: YaST2 - Developer documentation for yast2-network %description This package contains the YaST2 component for network configuration. @@ -130,3 +144,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 d640daa92a96ec1e82677282815b57ce834cd75a549931dfdf2e9a1700a8ce0c Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Fri, 12 Aug 2011 14:47:39 +0000 Subject: [PATCH 2/2] - Integrated patches from Justus Winter: - Make MTU configurable using YaPI. - YaPI (re)Read: Don't append a slash to ipaddr like '1.2.3.4/8/'. - 2.21.3 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=143 --- yast2-network-2.21.2.tar.bz2 | 3 -- yast2-network-2.21.3.tar.bz2 | 3 ++ yast2-network.changes | 8 ++++ yast2-network.spec | 79 +++++++++++++++--------------------- 4 files changed, 43 insertions(+), 50 deletions(-) delete mode 100644 yast2-network-2.21.2.tar.bz2 create mode 100644 yast2-network-2.21.3.tar.bz2 diff --git a/yast2-network-2.21.2.tar.bz2 b/yast2-network-2.21.2.tar.bz2 deleted file mode 100644 index d602410..0000000 --- a/yast2-network-2.21.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0cff27027c2c1f3348a3b8103387b2816e2db40f2ca69a17d283580ec62e855 -size 294959 diff --git a/yast2-network-2.21.3.tar.bz2 b/yast2-network-2.21.3.tar.bz2 new file mode 100644 index 0000000..d6c9280 --- /dev/null +++ b/yast2-network-2.21.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e9aff1d0cdddd0baa13d97407ce589922edab33bb879342af503182e9e8f57f +size 293670 diff --git a/yast2-network.changes b/yast2-network.changes index 0aeae5b..7514314 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 12 16:27:39 CEST 2011 - mvidner@suse.cz + +- Integrated patches from Justus Winter: + - Make MTU configurable using YaPI. + - YaPI (re)Read: Don't append a slash to ipaddr like '1.2.3.4/8/'. +- 2.21.3 + ------------------------------------------------------------------- Thu Aug 11 16:33:26 CEST 2011 - mvidner@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 365fc13..3e1503e 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.3) # -# 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.3 +Release: 0 -Name: yast2-network -Version: 2.21.2 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.21.2.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.21.3.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. @@ -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.2 +%setup -n yast2-network-2.21.3 %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