From bf3bf24f4db8e1cf11cdbfac9c2d52d61ae3b4a2f1108b9d374be7a0ab279744 Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Tue, 13 Apr 2010 10:05:53 +0000 Subject: [PATCH 1/3] 2,7d1 < Tue Apr 13 12:04:09 CEST 2010 - mzugec@suse.cz < < - run iscsid in foreground (bnc#589064) < - 2.19.4 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=14 --- yast2-iscsi-client-2.19.3.tar.bz2 | 3 --- yast2-iscsi-client-2.19.4.tar.bz2 | 3 +++ yast2-iscsi-client.changes | 6 +++++ yast2-iscsi-client.changes.rej | 13 +++++++++ yast2-iscsi-client.spec | 45 +++++++++++-------------------- 5 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 yast2-iscsi-client-2.19.3.tar.bz2 create mode 100644 yast2-iscsi-client-2.19.4.tar.bz2 create mode 100644 yast2-iscsi-client.changes.rej diff --git a/yast2-iscsi-client-2.19.3.tar.bz2 b/yast2-iscsi-client-2.19.3.tar.bz2 deleted file mode 100644 index 60118b4..0000000 --- a/yast2-iscsi-client-2.19.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b283436ad05969fc79f436bf62f7de3a332dd0469e81c6b58e3bd3841a379f21 -size 101480 diff --git a/yast2-iscsi-client-2.19.4.tar.bz2 b/yast2-iscsi-client-2.19.4.tar.bz2 new file mode 100644 index 0000000..f71876f --- /dev/null +++ b/yast2-iscsi-client-2.19.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce387da2b33200935082a8e5932126f1123c5de7e41e59191c8f8902fb8a693b +size 97992 diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes index 23ed46c..2a2f840 100644 --- a/yast2-iscsi-client.changes +++ b/yast2-iscsi-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 13 12:04:09 CEST 2010 - mzugec@suse.cz + +- run iscsid in foreground (bnc#589064) +- 2.19.4 + ------------------------------------------------------------------- Tue Mar 23 09:57:19 CET 2010 - mzugec@suse.cz diff --git a/yast2-iscsi-client.changes.rej b/yast2-iscsi-client.changes.rej new file mode 100644 index 0000000..109da07 --- /dev/null +++ b/yast2-iscsi-client.changes.rej @@ -0,0 +1,13 @@ +--- package/yast2-iscsi-client.changes (revision 61674) ++++ package/yast2-iscsi-client.changes (working copy) +@@ -1,4 +1,10 @@ + ------------------------------------------------------------------- ++Tue Apr 13 11:56:43 CEST 2010 - mzugec@suse.cz ++ ++- run iscsid in foreground (bnc#589064) ++- 2.17.20 ++ ++------------------------------------------------------------------- + Tue Mar 23 09:50:53 CET 2010 - mzugec@suse.cz + + - read iBFT before start daemon (bnc#573864) diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec index 9b21dd1..3e34aaf 100644 --- a/yast2-iscsi-client.spec +++ b/yast2-iscsi-client.spec @@ -1,52 +1,39 @@ # -# spec file for package yast2-iscsi-client (Version 2.19.3) +# spec file for package yast2-iscsi-client (Version 2.19.4) # -# 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-iscsi-client -Version: 2.19.3 -Release: 1 +Name: yast2-iscsi-client +Version: 2.19.4 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.19.3.tar.bz2 -Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-iscsi-client-2.19.4.tar.bz2 -Group: System/YaST -License: GPLv2+ -BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite +prefix: /usr -Requires: yast2-packager +Group: System/YaST +License: GPL v2 or later +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager + +Requires: yast2-packager # network needs Wizard::OpenCancelOKDialog() # function from yast2-2.18.2 Requires: yast2 >= 2.18.2 -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - iSCSI Client Configuration +Summary: YaST2 - iSCSI Client Configuration %description This package contains the YaST2 component for configuration of an iSCSI client. %prep -%setup -n yast2-iscsi-client-2.19.3 +%setup -n yast2-iscsi-client-2.19.4 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +57,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %clean rm -rf "$RPM_BUILD_ROOT" @@ -86,4 +74,3 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/iscsid.scr %doc %{prefix}/share/doc/packages/yast2-iscsi-client /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc -%changelog From 6ac03391e6afd6f053ae29f065a44ca2ae864a2a7416e293b8426007e408ca02 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 16 Apr 2010 00:00:09 +0000 Subject: [PATCH 2/3] Accepting request 37851 from YaST:Head checked in (request 37851) OBS-URL: https://build.opensuse.org/request/show/37851 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=15 --- yast2-iscsi-client-2.19.3.tar.bz2 | 3 +++ yast2-iscsi-client-2.19.4.tar.bz2 | 3 --- yast2-iscsi-client.changes | 6 ----- yast2-iscsi-client.changes.rej | 13 --------- yast2-iscsi-client.spec | 45 ++++++++++++++++++++----------- 5 files changed, 32 insertions(+), 38 deletions(-) create mode 100644 yast2-iscsi-client-2.19.3.tar.bz2 delete mode 100644 yast2-iscsi-client-2.19.4.tar.bz2 delete mode 100644 yast2-iscsi-client.changes.rej diff --git a/yast2-iscsi-client-2.19.3.tar.bz2 b/yast2-iscsi-client-2.19.3.tar.bz2 new file mode 100644 index 0000000..60118b4 --- /dev/null +++ b/yast2-iscsi-client-2.19.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b283436ad05969fc79f436bf62f7de3a332dd0469e81c6b58e3bd3841a379f21 +size 101480 diff --git a/yast2-iscsi-client-2.19.4.tar.bz2 b/yast2-iscsi-client-2.19.4.tar.bz2 deleted file mode 100644 index f71876f..0000000 --- a/yast2-iscsi-client-2.19.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce387da2b33200935082a8e5932126f1123c5de7e41e59191c8f8902fb8a693b -size 97992 diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes index 2a2f840..23ed46c 100644 --- a/yast2-iscsi-client.changes +++ b/yast2-iscsi-client.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 13 12:04:09 CEST 2010 - mzugec@suse.cz - -- run iscsid in foreground (bnc#589064) -- 2.19.4 - ------------------------------------------------------------------- Tue Mar 23 09:57:19 CET 2010 - mzugec@suse.cz diff --git a/yast2-iscsi-client.changes.rej b/yast2-iscsi-client.changes.rej deleted file mode 100644 index 109da07..0000000 --- a/yast2-iscsi-client.changes.rej +++ /dev/null @@ -1,13 +0,0 @@ ---- package/yast2-iscsi-client.changes (revision 61674) -+++ package/yast2-iscsi-client.changes (working copy) -@@ -1,4 +1,10 @@ - ------------------------------------------------------------------- -+Tue Apr 13 11:56:43 CEST 2010 - mzugec@suse.cz -+ -+- run iscsid in foreground (bnc#589064) -+- 2.17.20 -+ -+------------------------------------------------------------------- - Tue Mar 23 09:50:53 CET 2010 - mzugec@suse.cz - - - read iBFT before start daemon (bnc#573864) diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec index 3e34aaf..9b21dd1 100644 --- a/yast2-iscsi-client.spec +++ b/yast2-iscsi-client.spec @@ -1,39 +1,52 @@ # -# spec file for package yast2-iscsi-client (Version 2.19.4) +# spec file for package yast2-iscsi-client (Version 2.19.3) # +# 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-iscsi-client -Version: 2.19.4 -Release: 0 +Name: yast2-iscsi-client +Version: 2.19.3 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-iscsi-client-2.19.3.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.19.4.tar.bz2 +Prefix: /usr -prefix: /usr +Group: System/YaST +License: GPLv2+ +BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite -Group: System/YaST -License: GPL v2 or later -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager - -Requires: yast2-packager +Requires: yast2-packager # network needs Wizard::OpenCancelOKDialog() # function from yast2-2.18.2 Requires: yast2 >= 2.18.2 -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - iSCSI Client Configuration +Summary: YaST2 - iSCSI Client Configuration %description This package contains the YaST2 component for configuration of an iSCSI client. %prep -%setup -n yast2-iscsi-client-2.19.4 +%setup -n yast2-iscsi-client-2.19.3 %build %{prefix}/bin/y2tool y2autoconf @@ -57,7 +70,6 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - %clean rm -rf "$RPM_BUILD_ROOT" @@ -74,3 +86,4 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/iscsid.scr %doc %{prefix}/share/doc/packages/yast2-iscsi-client /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc +%changelog From b87e5da40977108c886d097645e794ec9955655fe1dad07c2585da74bfb028d5 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 16 Apr 2010 00:00:10 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/yast2-iscsi-client revision 49.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=71aafe520e28739d9171083b515b3734 --- yast2-iscsi-client-2.19.3.tar.bz2 | 3 --- yast2-iscsi-client-2.19.4.tar.bz2 | 3 +++ yast2-iscsi-client.changes | 6 ++++++ yast2-iscsi-client.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 yast2-iscsi-client-2.19.3.tar.bz2 create mode 100644 yast2-iscsi-client-2.19.4.tar.bz2 diff --git a/yast2-iscsi-client-2.19.3.tar.bz2 b/yast2-iscsi-client-2.19.3.tar.bz2 deleted file mode 100644 index 60118b4..0000000 --- a/yast2-iscsi-client-2.19.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b283436ad05969fc79f436bf62f7de3a332dd0469e81c6b58e3bd3841a379f21 -size 101480 diff --git a/yast2-iscsi-client-2.19.4.tar.bz2 b/yast2-iscsi-client-2.19.4.tar.bz2 new file mode 100644 index 0000000..f71876f --- /dev/null +++ b/yast2-iscsi-client-2.19.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce387da2b33200935082a8e5932126f1123c5de7e41e59191c8f8902fb8a693b +size 97992 diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes index 23ed46c..2a2f840 100644 --- a/yast2-iscsi-client.changes +++ b/yast2-iscsi-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 13 12:04:09 CEST 2010 - mzugec@suse.cz + +- run iscsid in foreground (bnc#589064) +- 2.19.4 + ------------------------------------------------------------------- Tue Mar 23 09:57:19 CET 2010 - mzugec@suse.cz diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec index 9b21dd1..1e20a76 100644 --- a/yast2-iscsi-client.spec +++ b/yast2-iscsi-client.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.19.3) +# spec file for package yast2-iscsi-client (Version 2.19.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.19.3 +Version: 2.19.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.19.3.tar.bz2 +Source0: yast2-iscsi-client-2.19.4.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ This package contains the YaST2 component for configuration of an iSCSI client. %prep -%setup -n yast2-iscsi-client-2.19.3 +%setup -n yast2-iscsi-client-2.19.4 %build %{prefix}/bin/y2tool y2autoconf