From 0e60fb8fe359f8fe4b55cd70ca5b67c814b5793a210ae13095bef2c57b41cf1e Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Mon, 24 May 2010 15:15:30 +0000 Subject: [PATCH 1/5] 2,13d1 < Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz < < - make add/edit route popup consistent (bnc#583136) < - 2.19.30 < < ------------------------------------------------------------------- < Mon May 17 15:12:05 CEST 2010 - mzugec@suse.cz < < - updated documentation URL (bnc#590742) < - 2.19.29 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=92 --- yast2-network-2.19.28.tar.bz2 | 3 -- yast2-network-2.19.30.tar.bz2 | 3 ++ yast2-network.changes | 12 ++++++ yast2-network.changes.rej | 14 +++++++ yast2-network.spec | 79 ++++++++++++++--------------------- 5 files changed, 61 insertions(+), 50 deletions(-) delete mode 100644 yast2-network-2.19.28.tar.bz2 create mode 100644 yast2-network-2.19.30.tar.bz2 create mode 100644 yast2-network.changes.rej diff --git a/yast2-network-2.19.28.tar.bz2 b/yast2-network-2.19.28.tar.bz2 deleted file mode 100644 index e98005f..0000000 --- a/yast2-network-2.19.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce16a25541c880936f7bc8d666c316038427add5033f14beb9f9889efa64fa01 -size 315529 diff --git a/yast2-network-2.19.30.tar.bz2 b/yast2-network-2.19.30.tar.bz2 new file mode 100644 index 0000000..07cb999 --- /dev/null +++ b/yast2-network-2.19.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef5618796ad2a5c2944e3ea38e8f78e56051c1048e776b3d25b598f73d275efb +size 315493 diff --git a/yast2-network.changes b/yast2-network.changes index b4465a8..fdb8bae 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz + +- make add/edit route popup consistent (bnc#583136) +- 2.19.30 + +------------------------------------------------------------------- +Mon May 17 15:12:05 CEST 2010 - mzugec@suse.cz + +- updated documentation URL (bnc#590742) +- 2.19.29 + ------------------------------------------------------------------- Mon May 17 12:17:30 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej new file mode 100644 index 0000000..78fec43 --- /dev/null +++ b/yast2-network.changes.rej @@ -0,0 +1,14 @@ +--- 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 c63695d..9e9de57 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # -# spec file for package yast2-network (Version 2.19.28) +# spec file for package yast2-network (Version 2.19.30) # -# 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.30 +Release: 0 -Name: yast2-network -Version: 2.19.28 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.28.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.30.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPLv2+ +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 # 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. @@ -73,7 +59,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.28 +%setup -n yast2-network-2.19.30 %build %{prefix}/bin/y2tool y2autoconf @@ -143,4 +129,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 From 34afb8ad23924a94b69717926d1208ac26d54701205d4db3c7dcae9dbb607a38 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 25 May 2010 13:03:47 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=93 --- yast2-network.changes.rej | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 yast2-network.changes.rej 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 From 78cae11bc50f2aef490f1ec7ea18d000aa452c4a33ba5ac5a8c8d05ff45ca568 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Thu, 27 May 2010 12:02:22 +0000 Subject: [PATCH 3/5] 2,7d1 < Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz < < - fixed duplicate items issue in UI (bnc#584842) < - 2.19.31 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=94 --- yast2-network-2.19.30.tar.bz2 | 3 --- yast2-network-2.19.31.tar.bz2 | 3 +++ yast2-network.changes | 6 ++++++ yast2-network.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 yast2-network-2.19.30.tar.bz2 create mode 100644 yast2-network-2.19.31.tar.bz2 diff --git a/yast2-network-2.19.30.tar.bz2 b/yast2-network-2.19.30.tar.bz2 deleted file mode 100644 index 07cb999..0000000 --- a/yast2-network-2.19.30.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef5618796ad2a5c2944e3ea38e8f78e56051c1048e776b3d25b598f73d275efb -size 315493 diff --git a/yast2-network-2.19.31.tar.bz2 b/yast2-network-2.19.31.tar.bz2 new file mode 100644 index 0000000..655861a --- /dev/null +++ b/yast2-network-2.19.31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a9cb90bccdc29b0a63203b57e7007efe72b0ecbd169b7b7779021937416e8f +size 315601 diff --git a/yast2-network.changes b/yast2-network.changes index fdb8bae..ccf7a0d 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz + +- fixed duplicate items issue in UI (bnc#584842) +- 2.19.31 + ------------------------------------------------------------------- Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 9e9de57..6e20a0e 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,15 +1,15 @@ # -# spec file for package yast2-network (Version 2.19.30) +# spec file for package yast2-network (Version 2.19.31) # # norootforbuild Name: yast2-network -Version: 2.19.30 +Version: 2.19.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.30.tar.bz2 +Source0: yast2-network-2.19.31.tar.bz2 prefix: /usr @@ -59,7 +59,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.30 +%setup -n yast2-network-2.19.31 %build %{prefix}/bin/y2tool y2autoconf From f2cf94daafcd3858250ea8a2ea5892a77d4c7d8721664525856faf56f95fcc83 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 28 May 2010 15:42:18 +0000 Subject: [PATCH 4/5] Accepting request 40725 from YaST:Head checked in (request 40725) OBS-URL: https://build.opensuse.org/request/show/40725 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=95 --- yast2-network-2.19.28.tar.bz2 | 3 ++ yast2-network-2.19.31.tar.bz2 | 3 -- yast2-network.changes | 18 -------- yast2-network.spec | 79 +++++++++++++++++++++-------------- 4 files changed, 50 insertions(+), 53 deletions(-) create mode 100644 yast2-network-2.19.28.tar.bz2 delete mode 100644 yast2-network-2.19.31.tar.bz2 diff --git a/yast2-network-2.19.28.tar.bz2 b/yast2-network-2.19.28.tar.bz2 new file mode 100644 index 0000000..e98005f --- /dev/null +++ b/yast2-network-2.19.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce16a25541c880936f7bc8d666c316038427add5033f14beb9f9889efa64fa01 +size 315529 diff --git a/yast2-network-2.19.31.tar.bz2 b/yast2-network-2.19.31.tar.bz2 deleted file mode 100644 index 655861a..0000000 --- a/yast2-network-2.19.31.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29a9cb90bccdc29b0a63203b57e7007efe72b0ecbd169b7b7779021937416e8f -size 315601 diff --git a/yast2-network.changes b/yast2-network.changes index ccf7a0d..b4465a8 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz - -- fixed duplicate items issue in UI (bnc#584842) -- 2.19.31 - -------------------------------------------------------------------- -Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz - -- make add/edit route popup consistent (bnc#583136) -- 2.19.30 - -------------------------------------------------------------------- -Mon May 17 15:12:05 CEST 2010 - mzugec@suse.cz - -- updated documentation URL (bnc#590742) -- 2.19.29 - ------------------------------------------------------------------- Mon May 17 12:17:30 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 6e20a0e..c63695d 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # -# spec file for package yast2-network (Version 2.19.31) +# spec file for package yast2-network (Version 2.19.28) # +# 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.31 -Release: 0 +Name: yast2-network +Version: 2.19.28 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.31.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.28.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.31 +%setup -n yast2-network-2.19.28 %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 From 8dbf25cbdba7da5b55e1e9450e6534cb0851274d0e7fde6e57f60d0060260c5b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 28 May 2010 15:42:19 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/yast2-network revision 215.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=56ff378898ff8f44948f27bdbefeb083 --- yast2-network-2.19.28.tar.bz2 | 3 --- yast2-network-2.19.31.tar.bz2 | 3 +++ yast2-network.changes | 18 ++++++++++++++++++ yast2-network.spec | 8 ++++---- 4 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 yast2-network-2.19.28.tar.bz2 create mode 100644 yast2-network-2.19.31.tar.bz2 diff --git a/yast2-network-2.19.28.tar.bz2 b/yast2-network-2.19.28.tar.bz2 deleted file mode 100644 index e98005f..0000000 --- a/yast2-network-2.19.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce16a25541c880936f7bc8d666c316038427add5033f14beb9f9889efa64fa01 -size 315529 diff --git a/yast2-network-2.19.31.tar.bz2 b/yast2-network-2.19.31.tar.bz2 new file mode 100644 index 0000000..655861a --- /dev/null +++ b/yast2-network-2.19.31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a9cb90bccdc29b0a63203b57e7007efe72b0ecbd169b7b7779021937416e8f +size 315601 diff --git a/yast2-network.changes b/yast2-network.changes index b4465a8..ccf7a0d 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz + +- fixed duplicate items issue in UI (bnc#584842) +- 2.19.31 + +------------------------------------------------------------------- +Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz + +- make add/edit route popup consistent (bnc#583136) +- 2.19.30 + +------------------------------------------------------------------- +Mon May 17 15:12:05 CEST 2010 - mzugec@suse.cz + +- updated documentation URL (bnc#590742) +- 2.19.29 + ------------------------------------------------------------------- Mon May 17 12:17:30 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index c63695d..e9faab6 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.28) +# spec file for package yast2-network (Version 2.19.31) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-network -Version: 2.19.28 +Version: 2.19.31 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.28.tar.bz2 +Source0: yast2-network-2.19.31.tar.bz2 Prefix: /usr @@ -73,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.28 +%setup -n yast2-network-2.19.31 %build %{prefix}/bin/y2tool y2autoconf