From 0e6b30e42a251a845654e3f6a5e639fb77543d2a26bd445310f142beebffe86b Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 22 Jun 2010 10:41:49 +0000 Subject: [PATCH 1/3] 2,7d1 < Tue Jun 22 12:36:47 CEST 2010 - mzugec@suse.cz < < - updated firmware dependency list (bnc#608979) < - 2.19.32 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=96 --- yast2-network-2.19.31.tar.bz2 | 3 -- yast2-network-2.19.32.tar.bz2 | 3 ++ yast2-network.changes | 6 +++ yast2-network.spec | 79 ++++++++++++++--------------------- 4 files changed, 41 insertions(+), 50 deletions(-) delete mode 100644 yast2-network-2.19.31.tar.bz2 create mode 100644 yast2-network-2.19.32.tar.bz2 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-2.19.32.tar.bz2 b/yast2-network-2.19.32.tar.bz2 new file mode 100644 index 0000000..b5c3a1b --- /dev/null +++ b/yast2-network-2.19.32.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a59afcea7a4cdd9fc151e8bc841661a06ca20d3c7e273a29c863bae2c37b494 +size 315608 diff --git a/yast2-network.changes b/yast2-network.changes index ccf7a0d..cd32fab 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 22 12:36:47 CEST 2010 - mzugec@suse.cz + +- updated firmware dependency list (bnc#608979) +- 2.19.32 + ------------------------------------------------------------------- Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index e9faab6..ef1f58f 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,70 +1,56 @@ # -# spec file for package yast2-network (Version 2.19.31) +# spec file for package yast2-network (Version 2.19.32) # -# 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.32 +Release: 0 -Name: yast2-network -Version: 2.19.31 -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.32.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.31 +%setup -n yast2-network-2.19.32 %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 86ecc65af6faa924f5b06065a5022eb29e7c2669d53a5e222ba55fbaf616b2f6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 22 Jun 2010 14:37:04 +0000 Subject: [PATCH 2/3] Accepting request 41871 from YaST:Head checked in (request 41871) OBS-URL: https://build.opensuse.org/request/show/41871 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=97 --- yast2-network-2.19.31.tar.bz2 | 3 ++ yast2-network-2.19.32.tar.bz2 | 3 -- yast2-network.changes | 6 --- yast2-network.spec | 79 +++++++++++++++++++++-------------- 4 files changed, 50 insertions(+), 41 deletions(-) create mode 100644 yast2-network-2.19.31.tar.bz2 delete mode 100644 yast2-network-2.19.32.tar.bz2 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-2.19.32.tar.bz2 b/yast2-network-2.19.32.tar.bz2 deleted file mode 100644 index b5c3a1b..0000000 --- a/yast2-network-2.19.32.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a59afcea7a4cdd9fc151e8bc841661a06ca20d3c7e273a29c863bae2c37b494 -size 315608 diff --git a/yast2-network.changes b/yast2-network.changes index cd32fab..ccf7a0d 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 22 12:36:47 CEST 2010 - mzugec@suse.cz - -- updated firmware dependency list (bnc#608979) -- 2.19.32 - ------------------------------------------------------------------- Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index ef1f58f..e9faab6 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,70 @@ # -# spec file for package yast2-network (Version 2.19.32) +# spec file for package yast2-network (Version 2.19.31) # +# 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.32 -Release: 0 +Name: yast2-network +Version: 2.19.31 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.32.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.31.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.32 +%setup -n yast2-network-2.19.31 %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 a3f6208356ef0a777b9a89c58efca0e24e79890026298d932203a5303fb6ab65 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Jun 2010 14:37:05 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/yast2-network revision 216.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=a67e3747e11459a57c5e7b04dd00daab --- yast2-network-2.19.31.tar.bz2 | 3 --- yast2-network-2.19.32.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.31.tar.bz2 create mode 100644 yast2-network-2.19.32.tar.bz2 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-2.19.32.tar.bz2 b/yast2-network-2.19.32.tar.bz2 new file mode 100644 index 0000000..b5c3a1b --- /dev/null +++ b/yast2-network-2.19.32.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a59afcea7a4cdd9fc151e8bc841661a06ca20d3c7e273a29c863bae2c37b494 +size 315608 diff --git a/yast2-network.changes b/yast2-network.changes index ccf7a0d..cd32fab 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 22 12:36:47 CEST 2010 - mzugec@suse.cz + +- updated firmware dependency list (bnc#608979) +- 2.19.32 + ------------------------------------------------------------------- Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index e9faab6..11f6ff8 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.31) +# spec file for package yast2-network (Version 2.19.32) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-network -Version: 2.19.31 +Version: 2.19.32 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.31.tar.bz2 +Source0: yast2-network-2.19.32.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.31 +%setup -n yast2-network-2.19.32 %build %{prefix}/bin/y2tool y2autoconf