From 4dd243cc6c3ec5178812680cb3af11b5bdd4bef1ad3e6c95b4932fa02c0967ee Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 14 May 2010 22:31:56 +0000 Subject: [PATCH] Accepting request 40017 from YaST:Head checked in (request 40017) OBS-URL: https://build.opensuse.org/request/show/40017 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=89 --- yast2-network-2.19.26.tar.bz2 | 3 ++ yast2-network-2.19.27.tar.bz2 | 3 -- yast2-network.changes | 6 --- yast2-network.changes.rej | 14 ------- yast2-network.spec | 79 +++++++++++++++++++++-------------- 5 files changed, 50 insertions(+), 55 deletions(-) create mode 100644 yast2-network-2.19.26.tar.bz2 delete mode 100644 yast2-network-2.19.27.tar.bz2 delete mode 100644 yast2-network.changes.rej diff --git a/yast2-network-2.19.26.tar.bz2 b/yast2-network-2.19.26.tar.bz2 new file mode 100644 index 0000000..575bdbf --- /dev/null +++ b/yast2-network-2.19.26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b68424c6fe6f7336c3c769167325096a82af6b5eff375ec524ebfb525589f9c +size 315403 diff --git a/yast2-network-2.19.27.tar.bz2 b/yast2-network-2.19.27.tar.bz2 deleted file mode 100644 index 5c667d4..0000000 --- a/yast2-network-2.19.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07688c1ebe0edddea3a931e8393285b244370b76d87a6cdba116ee3b8c62d223 -size 315549 diff --git a/yast2-network.changes b/yast2-network.changes index dabfef1..0f3b0ca 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri May 14 10:54:52 CEST 2010 - mzugec@suse.cz - -- improved help text (bnc#580039) -- 2.19.27 - ------------------------------------------------------------------- Wed May 12 14:29:08 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej deleted file mode 100644 index 78fec43..0000000 --- a/yast2-network.changes.rej +++ /dev/null @@ -1,14 +0,0 @@ ---- package/yast2-network.changes (revision 61331) -+++ package/yast2-network.changes (working copy) -@@ -1,4 +1,11 @@ - ------------------------------------------------------------------- -+Wed Mar 17 09:05:30 CET 2010 - mzugec@suse.cz -+ -+- L3: in case of type different from config. name write INTERFACETYPE -+option (bnc#585458) -+- 2.17.128 -+ -+------------------------------------------------------------------- - Tue Mar 16 13:14:40 CET 2010 - mzugec@suse.cz - - - during 1st installation stage write correctly filename for ifcfg diff --git a/yast2-network.spec b/yast2-network.spec index 7293e1f..b5a1084 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # -# spec file for package yast2-network (Version 2.19.27) +# spec file for package yast2-network (Version 2.19.26) # +# 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.27 -Release: 0 +Name: yast2-network +Version: 2.19.26 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.27.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.26.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. @@ -59,7 +73,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.27 +%setup -n yast2-network-2.19.26 %build %{prefix}/bin/y2tool y2autoconf @@ -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