[scsi-target-utils] update to 1.0.30-1

[Andy Grover]

commit 2dffac858ce7ca4094a549a67f3204c3dcefc384
Author: Andy Grover <agrover at redhat.com>
Date:   Thu Aug 2 12:36:38 2012 -0700

    update to 1.0.30-1
    
    Signed-off-by: Andy Grover <agrover at redhat.com>

 .gitignore                                    |    2 +
 scsi-target-utils-dynamic-link-iser.patch     |  116 -------------------------
 scsi-target-utils-remove-xsltproc-check.patch |   10 +-
 scsi-target-utils.spec                        |   33 ++-----
 sources                                       |    2 +-
 5 files changed, 17 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 443e99f..7aea46a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /v1.0.22
 /v1.0.23
 /v1.0.24
+/v1.0.29
+/v1.0.30
diff --git a/scsi-target-utils-remove-xsltproc-check.patch b/scsi-target-utils-remove-xsltproc-check.patch
index 1e6f704..201052f 100644
--- a/scsi-target-utils-remove-xsltproc-check.patch
+++ b/scsi-target-utils-remove-xsltproc-check.patch
@@ -1,4 +1,4 @@
-commit ad75a57863efcbf264ef44c5643e64c5bad84cb9
+commit 8d56d4c034d9e02718566747eb147db5a6835ebc
 Author: Andy Grover <agrover at redhat.com>
 Date:   Wed Nov 2 22:15:32 2011 -0700
 
@@ -11,15 +11,15 @@ Date:   Wed Nov 2 22:15:32 2011 -0700
     Signed-off-by: Andy Grover <agrover at redhat.com>
 
 diff --git a/doc/Makefile b/doc/Makefile
-index 4370fb2..54d5a09 100644
+index f6352b3..0fc29f5 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
 @@ -32,35 +32,38 @@ clean:
  	rm -f $(XMLMAN) $(XMLHTML)
- 	rmdir manpages htmlpages
+ 	-rm -f manpages htmlpages
  
-+STYLEMAN = /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl
-+STYLEHTML = /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/html/docbook.xsl
++STYLEMAN = /usr/share/sgml/docbook/xsl-stylesheets-1.77.1/manpages/docbook.xsl
++STYLEHTML = /usr/share/sgml/docbook/xsl-stylesheets-1.77.1/html/docbook.xsl
 +
  manpages/tgtd.8: tgtd.8.xml
 -	-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index ec72aa7..4b43ba6 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -3,8 +3,8 @@
 %endif
 
 Name:           scsi-target-utils
-Version:        1.0.24
-Release:        3%{?dist}
+Version:        1.0.30
+Release:        1%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -16,13 +16,13 @@ Source2:        sysconfig.tgtd
 Source3:        targets.conf
 Patch0:         scsi-target-utils-redhatify-docs.patch
 Patch1:         scsi-target-utils-remove-xsltproc-check.patch
-Patch2:         scsi-target-utils-dynamic-link-iser.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig libxslt docbook-style-xsl systemd-units
 %if 0%{?with_rdma}
 BuildRequires:  libibverbs-devel librdmacm-devel
+Requires:       libibverbs librdmacm
 %endif
 Requires: lsof sg3_utils
 Requires(post): systemd-units
@@ -31,24 +31,10 @@ Requires(post): systemd-units
 The SCSI target package contains the daemon and tools to setup a SCSI targets.
 Currently, software iSCSI targets are supported.
 
-%if 0%{?with_rdma}
-%package iser
-Summary:        iSER (RDMA) support for SCSI Target
-Group:          System Environment/Daemons
-Requires:       libibverbs librdmacm
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description iser
-
-The SCSI target iser package adds support for ISCSI
-Extensions for RDMA (ISER) to scsi-target-utils.
-%endif
-
 %prep
-%setup -q -n fujita-tgt-e039354
+%setup -q -n fujita-tgt-9dc30be
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__sed} -i -e 's|-g -O2 -Wall|%{optflags}|' Makefile
@@ -94,7 +80,6 @@ if [ $1 -ge 1 ]; then
 fi
 
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -113,13 +98,13 @@ fi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/tgtd
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/targets.conf
 
-%if 0%{?with_rdma}
-%files iser
-%{_libdir}/tgt/*
-%endif
-
 
 %changelog
+* Thu Aug 2 2012 Andy Grover <agrover at redhat.com> - 1.0.30-1
+- New upstream release
+- Refresh patches
+- Drop separate package for iser
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 37976bf..1fef3ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85d4f84ca921819aa7953da9646fa0c6  v1.0.24
+7f85fe8ebab81ea9cf8146c0e28fcf1b  v1.0.30