From 2c4f2fbab36d1c031bf47ed35342a4f0e8579c9c32ee50df50d05a6765583923 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Thu, 29 Oct 2009 16:49:04 +0000 Subject: [PATCH 1/3] 2,7d1 < Thu Oct 29 17:47:14 CET 2009 - mzugec@suse.cz < < - physical identification for NIC cards (FaTE#307164) < - 2.18.53 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=38 --- ready | 0 yast2-network-2.18.52.tar.bz2 | 3 -- yast2-network-2.18.53.tar.bz2 | 3 ++ yast2-network.changes | 6 +++ yast2-network.spec | 91 +++++++++++++++++------------------ 5 files changed, 53 insertions(+), 50 deletions(-) delete mode 100644 ready delete mode 100644 yast2-network-2.18.52.tar.bz2 create mode 100644 yast2-network-2.18.53.tar.bz2 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2 deleted file mode 100644 index cae8547..0000000 --- a/yast2-network-2.18.52.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e -size 300238 diff --git a/yast2-network-2.18.53.tar.bz2 b/yast2-network-2.18.53.tar.bz2 new file mode 100644 index 0000000..29c1f66 --- /dev/null +++ b/yast2-network-2.18.53.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a34a483c20ab8d3f9326f1b598835076fccb9502c3b00fbf009b4d72f01edb1b +size 300532 diff --git a/yast2-network.changes b/yast2-network.changes index f184d08..8711188 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 29 17:47:14 CET 2009 - mzugec@suse.cz + +- physical identification for NIC cards (FaTE#307164) +- 2.18.53 + ------------------------------------------------------------------- Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index ec845f8..130b641 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,62 +1,56 @@ # -# spec file for package yast2-network (Version 2.18.52) +# spec file for package yast2-network (Version 2.18.53) # -# Copyright (c) 2009 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.18.53 +Release: 0 -Name: yast2-network -Version: 2.18.52 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.52.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPL v2 or later + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.18.53.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: yast2 >= 2.16.6 +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: yast2 >= 2.16.6 + # ProductControl::Disable* - yast2-2.18.23 -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 #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: GPL v2 or later 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.18.52 +%setup -n yast2-network-2.18.53 %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 cbb199866804c22935c29448f3a3112924d3a56806fb99a1c4a6ad2864aec52c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 2 Nov 2009 11:48:34 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=39 --- ready | 0 yast2-network-2.18.52.tar.bz2 | 3 ++ yast2-network-2.18.53.tar.bz2 | 3 -- yast2-network.changes | 6 --- yast2-network.spec | 91 ++++++++++++++++++----------------- 5 files changed, 50 insertions(+), 53 deletions(-) create mode 100644 ready create mode 100644 yast2-network-2.18.52.tar.bz2 delete mode 100644 yast2-network-2.18.53.tar.bz2 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2 new file mode 100644 index 0000000..cae8547 --- /dev/null +++ b/yast2-network-2.18.52.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e +size 300238 diff --git a/yast2-network-2.18.53.tar.bz2 b/yast2-network-2.18.53.tar.bz2 deleted file mode 100644 index 29c1f66..0000000 --- a/yast2-network-2.18.53.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a34a483c20ab8d3f9326f1b598835076fccb9502c3b00fbf009b4d72f01edb1b -size 300532 diff --git a/yast2-network.changes b/yast2-network.changes index 8711188..f184d08 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 29 17:47:14 CET 2009 - mzugec@suse.cz - -- physical identification for NIC cards (FaTE#307164) -- 2.18.53 - ------------------------------------------------------------------- Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index 130b641..ec845f8 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,56 +1,62 @@ # -# spec file for package yast2-network (Version 2.18.53) +# spec file for package yast2-network (Version 2.18.52) # +# Copyright (c) 2009 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.18.53 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.53.tar.bz2 - -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Name: yast2-network +Version: 2.18.52 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-network-2.18.52.tar.bz2 +Prefix: /usr +Group: System/YaST +License: GPL v2 or later # 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: yast2 >= 2.16.6 - +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: yast2 >= 2.16.6 # ProductControl::Disable* - yast2-2.18.23 -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 #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: GPL v2 or later 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.18.53 +%setup -n yast2-network-2.18.52 %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 c5853d2f1d92ccd07685f3c0cdc35855d40d458749bc4b39ce7edaaadd50699b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 2 Nov 2009 11:48:35 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/yast2-network revision 195.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=34457183f6f8e1b55fc418232db2ebb3 --- yast2-network-2.18.52.tar.bz2 | 3 --- yast2-network-2.18.53.tar.bz2 | 3 +++ yast2-network.changes | 6 ++++++ yast2-network.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 yast2-network-2.18.52.tar.bz2 create mode 100644 yast2-network-2.18.53.tar.bz2 diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2 deleted file mode 100644 index cae8547..0000000 --- a/yast2-network-2.18.52.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e -size 300238 diff --git a/yast2-network-2.18.53.tar.bz2 b/yast2-network-2.18.53.tar.bz2 new file mode 100644 index 0000000..29c1f66 --- /dev/null +++ b/yast2-network-2.18.53.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a34a483c20ab8d3f9326f1b598835076fccb9502c3b00fbf009b4d72f01edb1b +size 300532 diff --git a/yast2-network.changes b/yast2-network.changes index f184d08..8711188 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 29 17:47:14 CET 2009 - mzugec@suse.cz + +- physical identification for NIC cards (FaTE#307164) +- 2.18.53 + ------------------------------------------------------------------- Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz diff --git a/yast2-network.spec b/yast2-network.spec index ec845f8..466ecab 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.18.52) +# spec file for package yast2-network (Version 2.18.53) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-network -Version: 2.18.52 +Version: 2.18.53 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.52.tar.bz2 +Source0: yast2-network-2.18.53.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -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.18.52 +%setup -n yast2-network-2.18.53 %build %{prefix}/bin/y2tool y2autoconf