From de5aba4ed7ac4502e12fa086659858d8b315bc07a55b060bbaada2546517a78c Mon Sep 17 00:00:00 2001 From: Michal Zugec Date: Wed, 3 Mar 2010 09:46:57 +0000 Subject: [PATCH] 2,7d1 < Wed Mar 3 10:45:42 CET 2010 - mzugec@suse.cz < < - disable iBFT for non-x86 architecture (bnc#582615) < - 2.19.1 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=8 --- ready | 0 yast2-iscsi-client-2.19.0.tar.bz2 | 3 -- yast2-iscsi-client-2.19.1.tar.bz2 | 3 ++ yast2-iscsi-client.changes | 6 ++++ yast2-iscsi-client.changes.rej | 13 ++++++++ yast2-iscsi-client.spec | 55 ++++++++++++++----------------- 6 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 ready delete mode 100644 yast2-iscsi-client-2.19.0.tar.bz2 create mode 100644 yast2-iscsi-client-2.19.1.tar.bz2 create mode 100644 yast2-iscsi-client.changes.rej diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/yast2-iscsi-client-2.19.0.tar.bz2 b/yast2-iscsi-client-2.19.0.tar.bz2 deleted file mode 100644 index 3666c08..0000000 --- a/yast2-iscsi-client-2.19.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a971aa0819dc69eadf0a1237f7593bd9ecab5b58fac2a567ca892ad4b918047 -size 101735 diff --git a/yast2-iscsi-client-2.19.1.tar.bz2 b/yast2-iscsi-client-2.19.1.tar.bz2 new file mode 100644 index 0000000..338cf4d --- /dev/null +++ b/yast2-iscsi-client-2.19.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b41e9fc15a41dea1fc66fe2538ea1fda8cacabab7ff3c2c7dbbe6d47e48bf84a +size 101782 diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes index 83977f0..d5cd90a 100644 --- a/yast2-iscsi-client.changes +++ b/yast2-iscsi-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 3 10:45:42 CET 2010 - mzugec@suse.cz + +- disable iBFT for non-x86 architecture (bnc#582615) +- 2.19.1 + ------------------------------------------------------------------- Tue Feb 9 13:19:16 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..3192b9e --- /dev/null +++ b/yast2-iscsi-client.changes.rej @@ -0,0 +1,13 @@ +--- package/yast2-iscsi-client.changes (revision 60757) ++++ package/yast2-iscsi-client.changes (revision 61112) +@@ -1,4 +1,10 @@ + ------------------------------------------------------------------- ++Wed Mar 3 10:40:48 CET 2010 - mzugec@suse.cz ++ ++- disable iBFT for non-x86 architecture (bnc#582615) ++- 2.17.17 ++ ++------------------------------------------------------------------- + Tue Feb 9 13:11:21 CET 2010 - mzugec@suse.cz + + - wait when start iscsid (bnc#570678) diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec index c2ae4cd..37caf76 100644 --- a/yast2-iscsi-client.spec +++ b/yast2-iscsi-client.spec @@ -1,52 +1,48 @@ # -# spec file for package yast2-iscsi-client (Version 2.19.0) +# spec file for package yast2-iscsi-client (Version 2.19.1) # -# 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.0 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.19.0.tar.bz2 -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 -Requires: yast2-packager +Name: yast2-iscsi-client +Version: 2.19.1 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-iscsi-client-2.19.1.tar.bz2 + +prefix: /usr + +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 -Summary: YaST2 - iSCSI Client Configuration + +BuildArchitectures: noarch + +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.0 +%setup -n yast2-iscsi-client-2.19.1 %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) @@ -61,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" @@ -77,5 +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