From 4f0401a06c0337b747e84cda594dfd0bcd0ec24e9abeb1d7ed18ba88dd1162d5 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Mon, 8 Feb 2010 15:26:05 +0000 Subject: [PATCH 1/4] 2,7d1 < Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz < < - correctly setup iucv devices (bnc#575950) < - 2.19.10 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=65 --- ready | 0 yast2-network-2.19.10.tar.bz2 | 3 ++ yast2-network-2.19.9.tar.bz2 | 3 -- yast2-network.changes | 6 +++ yast2-network.spec | 91 +++++++++++++++++------------------ 5 files changed, 53 insertions(+), 50 deletions(-) delete mode 100644 ready create mode 100644 yast2-network-2.19.10.tar.bz2 delete mode 100644 yast2-network-2.19.9.tar.bz2 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/yast2-network-2.19.10.tar.bz2 b/yast2-network-2.19.10.tar.bz2 new file mode 100644 index 0000000..8659463 --- /dev/null +++ b/yast2-network-2.19.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:217d3ce3fb6d5de2bb23ed2288845a72a6bd9ab388b17aa60f452a3f62bcc7b7 +size 327278 diff --git a/yast2-network-2.19.9.tar.bz2 b/yast2-network-2.19.9.tar.bz2 deleted file mode 100644 index f24da75..0000000 --- a/yast2-network-2.19.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1de42d8eea553327f76a889322cfedcf3f48beacf80e445d02978df1cf0ade39 -size 296600 diff --git a/yast2-network.changes b/yast2-network.changes index d55b746..003c348 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz + +- correctly setup iucv devices (bnc#575950) +- 2.19.10 + ------------------------------------------------------------------- Wed Jan 27 15:21:42 CET 2010 - kmachalkova@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index ee8f9e3..7355806 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,62 +1,56 @@ # -# spec file for package yast2-network (Version 2.19.9) +# spec file for package yast2-network (Version 2.19.10) # -# 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.10 +Release: 0 -Name: yast2-network -Version: 2.19.9 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.9.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPLv2+ + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.10.tar.bz2 + +prefix: /usr + +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 -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 +Requires: yast2-country-data >= 2.16.3 + +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 + # carrier detection -Conflicts: yast2-core < 2.10.6 -Summary: YaST2 - Network Configuration +Conflicts: yast2-core < 2.10.6 + +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. @@ -65,14 +59,16 @@ This package contains the YaST2 component for network configuration. This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.19.9 +%setup -n yast2-network-2.19.10 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -86,6 +82,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %ifarch s390 s390x /bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/dsl.desktop /bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop @@ -122,6 +119,7 @@ fi /usr/share/YaST2/schema/autoyast/rnc/networking.rnc /usr/share/YaST2/schema/autoyast/rnc/host.rnc /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc + %dir %{prefix}/share/doc/packages/yast2-network %{prefix}/share/doc/packages/yast2-network/COPYING %readme %{prefix}/share/doc/packages/yast2-network/README @@ -131,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 7f6c673856b26b7e75a85fc1fbd11a03cd5fd7c18c84880de36bb73c8f1796c0 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 9 Feb 2010 14:52:54 +0000 Subject: [PATCH 2/4] 2,7d1 < Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz < < - ipv6: enable/disable both module and sysctl method (bnc#561611) < - 2.19.11 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=66 --- yast2-network-2.19.10.tar.bz2 | 3 --- yast2-network-2.19.11.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.10.tar.bz2 create mode 100644 yast2-network-2.19.11.tar.bz2 diff --git a/yast2-network-2.19.10.tar.bz2 b/yast2-network-2.19.10.tar.bz2 deleted file mode 100644 index 8659463..0000000 --- a/yast2-network-2.19.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:217d3ce3fb6d5de2bb23ed2288845a72a6bd9ab388b17aa60f452a3f62bcc7b7 -size 327278 diff --git a/yast2-network-2.19.11.tar.bz2 b/yast2-network-2.19.11.tar.bz2 new file mode 100644 index 0000000..661bbee --- /dev/null +++ b/yast2-network-2.19.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:630b2bd0ac233f0c16f355395e99141a065cc57d394b9db3ddd869d76ddd2ff7 +size 314623 diff --git a/yast2-network.changes b/yast2-network.changes index 003c348..60304ac 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz + +- ipv6: enable/disable both module and sysctl method (bnc#561611) +- 2.19.11 + ------------------------------------------------------------------- Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 7355806..2026997 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,15 +1,15 @@ # -# spec file for package yast2-network (Version 2.19.10) +# spec file for package yast2-network (Version 2.19.11) # # norootforbuild Name: yast2-network -Version: 2.19.10 +Version: 2.19.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.10.tar.bz2 +Source0: yast2-network-2.19.11.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.10 +%setup -n yast2-network-2.19.11 %build %{prefix}/bin/y2tool y2autoconf From 1a5cb645295460779573b5127194848d23e709115f24d983f9a17d9738ef144d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 9 Feb 2010 20:56:47 +0000 Subject: [PATCH 3/4] checked in (request 31926) OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=67 --- ready | 0 yast2-network-2.19.11.tar.bz2 | 3 -- yast2-network-2.19.9.tar.bz2 | 3 ++ yast2-network.changes | 12 ----- yast2-network.spec | 91 ++++++++++++++++++----------------- 5 files changed, 50 insertions(+), 59 deletions(-) create mode 100644 ready delete mode 100644 yast2-network-2.19.11.tar.bz2 create mode 100644 yast2-network-2.19.9.tar.bz2 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-network-2.19.11.tar.bz2 b/yast2-network-2.19.11.tar.bz2 deleted file mode 100644 index 661bbee..0000000 --- a/yast2-network-2.19.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:630b2bd0ac233f0c16f355395e99141a065cc57d394b9db3ddd869d76ddd2ff7 -size 314623 diff --git a/yast2-network-2.19.9.tar.bz2 b/yast2-network-2.19.9.tar.bz2 new file mode 100644 index 0000000..f24da75 --- /dev/null +++ b/yast2-network-2.19.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de42d8eea553327f76a889322cfedcf3f48beacf80e445d02978df1cf0ade39 +size 296600 diff --git a/yast2-network.changes b/yast2-network.changes index 60304ac..d55b746 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz - -- ipv6: enable/disable both module and sysctl method (bnc#561611) -- 2.19.11 - -------------------------------------------------------------------- -Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz - -- correctly setup iucv devices (bnc#575950) -- 2.19.10 - ------------------------------------------------------------------- Wed Jan 27 15:21:42 CET 2010 - kmachalkova@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 2026997..ee8f9e3 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,62 @@ # -# spec file for package yast2-network (Version 2.19.11) +# spec file for package yast2-network (Version 2.19.9) # +# 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.11 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.11.tar.bz2 - -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Name: yast2-network +Version: 2.19.9 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.19.9.tar.bz2 +Prefix: /usr +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 - -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 - +Requires: yast2-country-data >= 2.16.3 +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 # carrier detection -Conflicts: yast2-core < 2.10.6 - -Summary: YaST2 - Network Configuration +Conflicts: yast2-core < 2.10.6 +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,16 +65,14 @@ This package contains the YaST2 component for network configuration. This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.19.11 +%setup -n yast2-network-2.19.9 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install - export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -82,7 +86,6 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - %ifarch s390 s390x /bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/dsl.desktop /bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop @@ -119,7 +122,6 @@ fi /usr/share/YaST2/schema/autoyast/rnc/networking.rnc /usr/share/YaST2/schema/autoyast/rnc/host.rnc /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc - %dir %{prefix}/share/doc/packages/yast2-network %{prefix}/share/doc/packages/yast2-network/COPYING %readme %{prefix}/share/doc/packages/yast2-network/README @@ -129,3 +131,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 b83dffdacd1ebcc455e9a0f9aa821c2a203dcbaada7f4816660f107753050f6e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 9 Feb 2010 20:56:48 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/yast2-network revision 204.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=5abfe70e93deeddf5d8d34f6d0586a81 --- yast2-network-2.19.11.tar.bz2 | 3 +++ yast2-network-2.19.9.tar.bz2 | 3 --- yast2-network.changes | 12 ++++++++++++ yast2-network.spec | 8 ++++---- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 yast2-network-2.19.11.tar.bz2 delete mode 100644 yast2-network-2.19.9.tar.bz2 diff --git a/yast2-network-2.19.11.tar.bz2 b/yast2-network-2.19.11.tar.bz2 new file mode 100644 index 0000000..661bbee --- /dev/null +++ b/yast2-network-2.19.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:630b2bd0ac233f0c16f355395e99141a065cc57d394b9db3ddd869d76ddd2ff7 +size 314623 diff --git a/yast2-network-2.19.9.tar.bz2 b/yast2-network-2.19.9.tar.bz2 deleted file mode 100644 index f24da75..0000000 --- a/yast2-network-2.19.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1de42d8eea553327f76a889322cfedcf3f48beacf80e445d02978df1cf0ade39 -size 296600 diff --git a/yast2-network.changes b/yast2-network.changes index d55b746..60304ac 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz + +- ipv6: enable/disable both module and sysctl method (bnc#561611) +- 2.19.11 + +------------------------------------------------------------------- +Mon Feb 8 16:23:46 CET 2010 - mzugec@suse.cz + +- correctly setup iucv devices (bnc#575950) +- 2.19.10 + ------------------------------------------------------------------- Wed Jan 27 15:21:42 CET 2010 - kmachalkova@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index ee8f9e3..ca613e6 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.9) +# spec file for package yast2-network (Version 2.19.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-network -Version: 2.19.9 +Version: 2.19.11 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.9.tar.bz2 +Source0: yast2-network-2.19.11.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -65,7 +65,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.9 +%setup -n yast2-network-2.19.11 %build %{prefix}/bin/y2tool y2autoconf