From d0f73891f55f8118070d65efb86247dde5fc73ec3d8d5e7ded716277cafd3918 Mon Sep 17 00:00:00 2001
From: Thomas Fehr <null@suse.de>
Date: Tue, 10 Apr 2012 16:05:27 +0000
Subject: [PATCH] - version 2.22.1 - Changed license to GPL 2.0 - merged
 proofed texts - change potential race of chmod after file create (bnc#753129)

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=58
---
 yast2-iscsi-client-2.22.0.tar.bz2 |  3 ---
 yast2-iscsi-client-2.22.1.tar.bz2 |  3 +++
 yast2-iscsi-client.changes        | 16 +++++++++++
 yast2-iscsi-client.spec           | 44 ++++++++++++++++++-------------
 4 files changed, 45 insertions(+), 21 deletions(-)
 delete mode 100644 yast2-iscsi-client-2.22.0.tar.bz2
 create mode 100644 yast2-iscsi-client-2.22.1.tar.bz2

diff --git a/yast2-iscsi-client-2.22.0.tar.bz2 b/yast2-iscsi-client-2.22.0.tar.bz2
deleted file mode 100644
index 172a08c..0000000
--- a/yast2-iscsi-client-2.22.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81c6a2b33fe191435bc6ab20d6be39d97e24c1468623be48c0bcd644f87e5f4b
-size 106536
diff --git a/yast2-iscsi-client-2.22.1.tar.bz2 b/yast2-iscsi-client-2.22.1.tar.bz2
new file mode 100644
index 0000000..c0c1db1
--- /dev/null
+++ b/yast2-iscsi-client-2.22.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92525faed794815758d208d8eba63388603eae9424bdf73898763fff92f496c6
+size 106887
diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes
index 7e76156..8879289 100644
--- a/yast2-iscsi-client.changes
+++ b/yast2-iscsi-client.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Apr 10 17:36:36 CEST 2012 - fehr@suse.de
+
+- version 2.22.1
+- Changed license to GPL 2.0
+
+-------------------------------------------------------------------
+Thu Mar 29 15:15:41 CEST 2012 - jsuchome@suse.cz
+
+- merged proofed texts
+
+-------------------------------------------------------------------
+Wed Mar 21 11:48:21 CET 2012 - fehr@suse.de
+
+- change potential race of chmod after file create (bnc#753129)
+
 -------------------------------------------------------------------
 Wed Feb 15 11:36:05 CET 2012 - fehr@suse.de
 
diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec
index f165809..efe88fb 100644
--- a/yast2-iscsi-client.spec
+++ b/yast2-iscsi-client.spec
@@ -15,21 +15,28 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           yast2-iscsi-client
-Version:        2.22.0
+Version:        2.22.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-iscsi-client-2.22.0.tar.bz2
+Source0:        yast2-iscsi-client-%{version}.tar.bz2
 
-Prefix:         /usr
-
-Group:          System/YaST
-License:        GPL-2.0+
-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
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  doxygen
+BuildRequires:  libicu-devel
+BuildRequires:  libxslt
+BuildRequires:  perl-XML-Writer
+BuildRequires:  popt-devel
+BuildRequires:  sgml-skel
+BuildRequires:  update-desktop-files
+BuildRequires:  yast2
+BuildRequires:  yast2-devtools
+BuildRequires:  yast2-packagemanager-devel
+BuildRequires:  yast2-packager
+BuildRequires:  yast2-perl-bindings
+BuildRequires:  yast2-testsuite
 
 Requires:       yast2-packager
 
@@ -41,32 +48,33 @@ Requires:       yast2 >= 2.21.22
 BuildArch:      noarch
 
 Summary:        YaST2 - iSCSI Client Configuration
+License:        GPL-2.0
+Group:          System/YaST
 
 %description
 This package contains the YaST2 component for configuration of an iSCSI
 client.
 
 %prep
-%setup -n yast2-iscsi-client-2.22.0
+%setup -n yast2-iscsi-client-%{version}
 
 %build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_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}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works
 make %{?jobs:-j%jobs} V=1
 
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
     d=${f##*/}
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
@@ -83,9 +91,9 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/share/YaST2/clients/inst_iscsi-client.ycp
 /usr/share/YaST2/modules/IscsiClient.*
 /usr/share/YaST2/modules/IscsiClientLib.*
-%{prefix}/share/applications/YaST2/iscsi-client.desktop
+%{_prefix}/share/applications/YaST2/iscsi-client.desktop
 /usr/share/YaST2/scrconf/iscsid.scr
-%doc %{prefix}/share/doc/packages/yast2-iscsi-client
+%doc %{_prefix}/share/doc/packages/yast2-iscsi-client
 /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc
 
 %changelog