From 3310a72793f1577b4c34a4d5968e70b736f9dc7f6f2a6bc38df4cf8858451f38 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Thu, 11 Mar 2010 09:31:27 +0000 Subject: [PATCH 1/3] 2,8d1 < Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz < < - L3: update device name via which is system installed by AY < (bnc#578760) < - 2.19.14 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=71 --- ready | 0 yast2-network-2.19.13.tar.bz2 | 3 -- yast2-network-2.19.14.tar.bz2 | 3 ++ yast2-network.changes | 7 ++++ yast2-network.changes.rej | 24 +++++++++++ yast2-network.spec | 79 ++++++++++++++--------------------- 6 files changed, 66 insertions(+), 50 deletions(-) delete mode 100644 ready delete mode 100644 yast2-network-2.19.13.tar.bz2 create mode 100644 yast2-network-2.19.14.tar.bz2 create mode 100644 yast2-network.changes.rej diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/yast2-network-2.19.13.tar.bz2 b/yast2-network-2.19.13.tar.bz2 deleted file mode 100644 index ae1812a..0000000 --- a/yast2-network-2.19.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:037d4a18380e58377904831d0c2dffe6053ae76bed9dba5577695ab028fcd55c -size 327523 diff --git a/yast2-network-2.19.14.tar.bz2 b/yast2-network-2.19.14.tar.bz2 new file mode 100644 index 0000000..7c54e60 --- /dev/null +++ b/yast2-network-2.19.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da0efd0db2a162693f364cc12f4127589c473929e40e0bf5073d4e848f722cd7 +size 327629 diff --git a/yast2-network.changes b/yast2-network.changes index 0158e06..82fbd21 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz + +- L3: update device name via which is system installed by AY +(bnc#578760) +- 2.19.14 + ------------------------------------------------------------------- Tue Mar 2 09:57:05 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej new file mode 100644 index 0000000..d34e636 --- /dev/null +++ b/yast2-network.changes.rej @@ -0,0 +1,24 @@ +--- package/yast2-network.changes (revision 60923) ++++ package/yast2-network.changes (working copy) +@@ -1,4 +1,21 @@ + ------------------------------------------------------------------- ++Mon Mar 1 16:52:36 CET 2010 - mzugec@suse.cz ++ ++- NetHwDetection: use blacklist (bnc#580729) ++- 2.17.123 ++ ++------------------------------------------------------------------- ++Mon Feb 22 17:03:27 CET 2010 - juhliarik@suse.cz ++ ++- added fix for saving MAC address to ifcfg (bnc#578689) ++- 2.17.122 ++ ++------------------------------------------------------------------- ++Mon Feb 22 09:55:55 CET 2010 - mzugec@suse.cz ++ ++- mark string for translation (bnc#580019) ++ ++------------------------------------------------------------------- + Tue Feb 16 17:30:15 CET 2010 - jsrain@suse.cz + + - do not write network config files if not changed (fate#308978) diff --git a/yast2-network.spec b/yast2-network.spec index 1afcf3d..c2c9d04 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # -# spec file for package yast2-network (Version 2.19.13) +# spec file for package yast2-network (Version 2.19.14) # -# 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.14 +Release: 0 -Name: yast2-network -Version: 2.19.13 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.13.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.14.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.13 +%setup -n yast2-network-2.19.14 %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 cd6f0c5cbf1e71c6c95e9dda3362e77360bce16fdf44f1e2f564cd83f8cbacad Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 12 Mar 2010 00:47:34 +0000 Subject: [PATCH 2/3] Accepting request 34603 from YaST:Head checked in (request 34603) OBS-URL: https://build.opensuse.org/request/show/34603 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=72 --- ready | 0 yast2-network-2.19.13.tar.bz2 | 3 ++ yast2-network-2.19.14.tar.bz2 | 3 -- yast2-network.changes | 7 ---- yast2-network.changes.rej | 24 ----------- yast2-network.spec | 79 +++++++++++++++++++++-------------- 6 files changed, 50 insertions(+), 66 deletions(-) create mode 100644 ready create mode 100644 yast2-network-2.19.13.tar.bz2 delete mode 100644 yast2-network-2.19.14.tar.bz2 delete mode 100644 yast2-network.changes.rej diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-network-2.19.13.tar.bz2 b/yast2-network-2.19.13.tar.bz2 new file mode 100644 index 0000000..ae1812a --- /dev/null +++ b/yast2-network-2.19.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:037d4a18380e58377904831d0c2dffe6053ae76bed9dba5577695ab028fcd55c +size 327523 diff --git a/yast2-network-2.19.14.tar.bz2 b/yast2-network-2.19.14.tar.bz2 deleted file mode 100644 index 7c54e60..0000000 --- a/yast2-network-2.19.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da0efd0db2a162693f364cc12f4127589c473929e40e0bf5073d4e848f722cd7 -size 327629 diff --git a/yast2-network.changes b/yast2-network.changes index 82fbd21..0158e06 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz - -- L3: update device name via which is system installed by AY -(bnc#578760) -- 2.19.14 - ------------------------------------------------------------------- Tue Mar 2 09:57:05 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.changes.rej b/yast2-network.changes.rej deleted file mode 100644 index d34e636..0000000 --- a/yast2-network.changes.rej +++ /dev/null @@ -1,24 +0,0 @@ ---- package/yast2-network.changes (revision 60923) -+++ package/yast2-network.changes (working copy) -@@ -1,4 +1,21 @@ - ------------------------------------------------------------------- -+Mon Mar 1 16:52:36 CET 2010 - mzugec@suse.cz -+ -+- NetHwDetection: use blacklist (bnc#580729) -+- 2.17.123 -+ -+------------------------------------------------------------------- -+Mon Feb 22 17:03:27 CET 2010 - juhliarik@suse.cz -+ -+- added fix for saving MAC address to ifcfg (bnc#578689) -+- 2.17.122 -+ -+------------------------------------------------------------------- -+Mon Feb 22 09:55:55 CET 2010 - mzugec@suse.cz -+ -+- mark string for translation (bnc#580019) -+ -+------------------------------------------------------------------- - Tue Feb 16 17:30:15 CET 2010 - jsrain@suse.cz - - - do not write network config files if not changed (fate#308978) diff --git a/yast2-network.spec b/yast2-network.spec index c2c9d04..1afcf3d 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # -# spec file for package yast2-network (Version 2.19.14) +# spec file for package yast2-network (Version 2.19.13) # +# 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.14 -Release: 0 +Name: yast2-network +Version: 2.19.13 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.14.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.13.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.14 +%setup -n yast2-network-2.19.13 %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 061323775a3cd4414a8cca3c9a688ad403b6ad47b4c862333692dbcec25a759d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 12 Mar 2010 00:47:35 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/yast2-network revision 206.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=30318e3eb98547bfc65daa8157eceeef --- yast2-network-2.19.13.tar.bz2 | 3 --- yast2-network-2.19.14.tar.bz2 | 3 +++ yast2-network.changes | 7 +++++++ yast2-network.spec | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 yast2-network-2.19.13.tar.bz2 create mode 100644 yast2-network-2.19.14.tar.bz2 diff --git a/yast2-network-2.19.13.tar.bz2 b/yast2-network-2.19.13.tar.bz2 deleted file mode 100644 index ae1812a..0000000 --- a/yast2-network-2.19.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:037d4a18380e58377904831d0c2dffe6053ae76bed9dba5577695ab028fcd55c -size 327523 diff --git a/yast2-network-2.19.14.tar.bz2 b/yast2-network-2.19.14.tar.bz2 new file mode 100644 index 0000000..7c54e60 --- /dev/null +++ b/yast2-network-2.19.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da0efd0db2a162693f364cc12f4127589c473929e40e0bf5073d4e848f722cd7 +size 327629 diff --git a/yast2-network.changes b/yast2-network.changes index 0158e06..82fbd21 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz + +- L3: update device name via which is system installed by AY +(bnc#578760) +- 2.19.14 + ------------------------------------------------------------------- Tue Mar 2 09:57:05 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 1afcf3d..bcdf295 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.13) +# spec file for package yast2-network (Version 2.19.14) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-network -Version: 2.19.13 +Version: 2.19.14 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.13.tar.bz2 +Source0: yast2-network-2.19.14.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.13 +%setup -n yast2-network-2.19.14 %build %{prefix}/bin/y2tool y2autoconf