From 7023f9725891019387c20c7628f5c20bcdc71566ee8f62c49b451539407da5e9 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 1 Aug 2013 07:51:48 +0000
Subject: [PATCH 01/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=172
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index 7243a6f..e8ed5c7 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f728e2bb0ce6b0b73ba187e3c15f72d7f0910e1f31262356a7c6343de22e366
-size 108211
+oid sha256:2613c40c99d9be0e02d936e660d5de1bd6f772c046ab76b2ae7f44fd08b86898
+size 108224

From 279579fdfe9b7db36f13b29c46285eba33c70d88e3e55b6f58753651eddd868c Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 2 Aug 2013 17:24:51 +0000
Subject: [PATCH 02/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=173
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index e8ed5c7..13729f7 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2613c40c99d9be0e02d936e660d5de1bd6f772c046ab76b2ae7f44fd08b86898
-size 108224
+oid sha256:30780739f0ec947d8ab5a4e25973120167e979fc17ed8337892810dfd89c8265
+size 108361

From 02fa8f6d2ba03de9b37519935b5d9be117ca5577c6a8b9aac1796c2abadc30c5 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 7 Aug 2013 18:41:57 +0000
Subject: [PATCH 03/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=174
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index 13729f7..f47ffdc 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30780739f0ec947d8ab5a4e25973120167e979fc17ed8337892810dfd89c8265
-size 108361
+oid sha256:8ce061136ea81d0a95670b90fceed5bbdf07c4caffef76431cc3082a3bf42f66
+size 108366

From 809375e8fc2d9e070498f09bc4cb4d42b1d55be460ed431ca9b485bf6251179a Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 13 Aug 2013 10:26:11 +0000
Subject: [PATCH 04/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=175
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index f47ffdc..400563d 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ce061136ea81d0a95670b90fceed5bbdf07c4caffef76431cc3082a3bf42f66
-size 108366
+oid sha256:6538fd1f35add3525b49c02e827d63c720b973d3d5634bda22e8691519c58355
+size 108640

From 16fef89ac482133ae389529d2eccd8e3b9d82d32d66f8066122de28c9b4669a4 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 13 Aug 2013 15:06:26 +0000
Subject: [PATCH 05/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=176
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index 400563d..5169173 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6538fd1f35add3525b49c02e827d63c720b973d3d5634bda22e8691519c58355
-size 108640
+oid sha256:332208e022adce1be8003ad1c835d26675149b81cf00a39895ce8c4a9e10bad3
+size 108681

From 89f176d62a44459edc8ff149bb9d2ae85ad79a7b23e9ea503779e07853955d51 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 11 Sep 2013 15:49:31 +0000
Subject: [PATCH 06/10] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=177
---
 yast2-iscsi-client-3.0.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
index 5169173..c642bce 100644
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ b/yast2-iscsi-client-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:332208e022adce1be8003ad1c835d26675149b81cf00a39895ce8c4a9e10bad3
-size 108681
+oid sha256:e4a4abf7821d94fdbd06665ee43b7d4106df4f121725321ee181327dd0326b17
+size 108676

From 6261dff89d368c583673fee275127eb6f45da5a0af4a5387990c02558b959537 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.com>
Date: Wed, 16 Oct 2013 09:05:49 +0000
Subject: [PATCH 07/10] trigger service run

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=179
---
 yast2-iscsi-client-3.0.0.tar.bz2 |  3 --
 yast2-iscsi-client-3.1.0.tar.bz2 |  3 ++
 yast2-iscsi-client.changes       |  7 +++++
 yast2-iscsi-client.spec          | 52 +++++++++++---------------------
 4 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 yast2-iscsi-client-3.0.0.tar.bz2
 create mode 100644 yast2-iscsi-client-3.1.0.tar.bz2

diff --git a/yast2-iscsi-client-3.0.0.tar.bz2 b/yast2-iscsi-client-3.0.0.tar.bz2
deleted file mode 100644
index c642bce..0000000
--- a/yast2-iscsi-client-3.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4a4abf7821d94fdbd06665ee43b7d4106df4f121725321ee181327dd0326b17
-size 108676
diff --git a/yast2-iscsi-client-3.1.0.tar.bz2 b/yast2-iscsi-client-3.1.0.tar.bz2
new file mode 100644
index 0000000..273761b
--- /dev/null
+++ b/yast2-iscsi-client-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23db20c92d43f3d33e3549412e3feabd5e070be91b13ed50bd98008a45a3a720
+size 30134
diff --git a/yast2-iscsi-client.changes b/yast2-iscsi-client.changes
index a8dab41..a7e9990 100644
--- a/yast2-iscsi-client.changes
+++ b/yast2-iscsi-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 18 16:40:45 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Jul 31 08:31:18 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec
index 1c37e41..c337331 100644
--- a/yast2-iscsi-client.spec
+++ b/yast2-iscsi-client.spec
@@ -17,11 +17,11 @@
 
 
 Name:           yast2-iscsi-client
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-iscsi-client-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 # Service module switched to systemd
 BuildRequires:  docbook-xsl-stylesheets
@@ -33,7 +33,7 @@ BuildRequires:  popt-devel
 BuildRequires:  sgml-skel
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2 >= 2.23.15
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-packagemanager-devel
 BuildRequires:  yast2-packager
 BuildRequires:  yast2-perl-bindings
@@ -59,44 +59,26 @@ This package contains the YaST2 component for configuration of an iSCSI
 client.
 
 %prep
-%setup -n yast2-iscsi-client-%{version}
+%setup -n %{name}-%{version}
 
 %build
-%{_prefix}/bin/y2tool y2autoconf
-%{_prefix}/bin/y2tool y2automake
-autoreconf --force --install
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./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
+%yast_build
 
 %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
-    d=${f##*/}
-    %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%yast_install
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/YaST2/include/iscsi-client
-/usr/share/YaST2/include/iscsi-client/*
-/usr/share/YaST2/clients/iscsi-client.rb
-/usr/share/YaST2/clients/iscsi-client_*.rb
-/usr/share/YaST2/clients/inst_iscsi-client.rb
-/usr/share/YaST2/modules/IscsiClient.*
-/usr/share/YaST2/modules/IscsiClientLib.*
-%{_prefix}/share/applications/YaST2/iscsi-client.desktop
-/usr/share/YaST2/scrconf/iscsid.scr
-%doc %{_prefix}/share/doc/packages/yast2-iscsi-client
-/usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc
+%dir %{yast_yncludedir}/iscsi-client
+%{yast_yncludedir}/iscsi-client/*
+%{yast_clientdir}/iscsi-client.rb
+%{yast_clientdir}/iscsi-client_*.rb
+%{yast_clientdir}/inst_iscsi-client.rb
+%{yast_moduledir}/IscsiClient.*
+%{yast_moduledir}/IscsiClientLib.*
+%{yast_desktopdir}/iscsi-client.desktop
+%{yast_scrconfdir}/iscsid.scr
+%doc %{yast_docdir}
+%{yast_schemadir}/autoyast/rnc/iscsi-client.rnc
 
 %changelog

From b22a536da8b4c9a8dda7d67740dc347641a536ed68a940ded83686230980aacd Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 16 Oct 2013 09:34:08 +0000
Subject: [PATCH 08/10] Updated to git ref 4a4aa1e

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=180
---
 yast2-iscsi-client-3.1.0.tar.bz2 | 4 ++--
 yast2-iscsi-client.spec          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.1.0.tar.bz2 b/yast2-iscsi-client-3.1.0.tar.bz2
index 273761b..cf936d8 100644
--- a/yast2-iscsi-client-3.1.0.tar.bz2
+++ b/yast2-iscsi-client-3.1.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23db20c92d43f3d33e3549412e3feabd5e070be91b13ed50bd98008a45a3a720
-size 30134
+oid sha256:e3024f22a34f1e5d6e90694d5e489c1312c0a3c864ccaddb45d2f7dfff09ab96
+size 37140
diff --git a/yast2-iscsi-client.spec b/yast2-iscsi-client.spec
index c337331..ab455f7 100644
--- a/yast2-iscsi-client.spec
+++ b/yast2-iscsi-client.spec
@@ -30,6 +30,7 @@ BuildRequires:  libicu-devel
 BuildRequires:  libxslt
 BuildRequires:  perl-XML-Writer
 BuildRequires:  popt-devel
+BuildRequires:  rubygem-rspec
 BuildRequires:  sgml-skel
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2 >= 2.23.15

From 6ebd7c479fc8a88b5624b110bcee862bb57244bcfb95d494425cce29bc5b13b1 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 17 Oct 2013 07:03:24 +0000
Subject: [PATCH 09/10] Updated to git ref c502f10

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=181
---
 yast2-iscsi-client-3.1.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.1.0.tar.bz2 b/yast2-iscsi-client-3.1.0.tar.bz2
index cf936d8..f9eb95b 100644
--- a/yast2-iscsi-client-3.1.0.tar.bz2
+++ b/yast2-iscsi-client-3.1.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3024f22a34f1e5d6e90694d5e489c1312c0a3c864ccaddb45d2f7dfff09ab96
-size 37140
+oid sha256:9aa84cab284884f5bdd5f411ee9a237a5f4dfb3fb6655eb1f81c3470d20b7fd5
+size 37147

From 9f7f8001ba34ddd8bdc4b29a2aadf3024f49d93b6398bc45e5ea78aea9df6d84 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 17 Oct 2013 12:48:15 +0000
Subject: [PATCH 10/10] Updated to git ref 87cf158

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-iscsi-client?expand=0&rev=182
---
 yast2-iscsi-client-3.1.0.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yast2-iscsi-client-3.1.0.tar.bz2 b/yast2-iscsi-client-3.1.0.tar.bz2
index f9eb95b..af76d74 100644
--- a/yast2-iscsi-client-3.1.0.tar.bz2
+++ b/yast2-iscsi-client-3.1.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9aa84cab284884f5bdd5f411ee9a237a5f4dfb3fb6655eb1f81c3470d20b7fd5
-size 37147
+oid sha256:045870c187e0b3d22969285de9826e49ca28c278bd59e003bec8b5e275825455
+size 37225