[iwhd/f17] update iwhd.spec for iwhd-1.4; update patch1

[Jim Meyering]

commit a6649f5e09e830c16f4b0cb7dd2ac1eb6a99bc1a
Author: Jim Meyering <meyering at redhat.com>
Date:   Mon Mar 5 20:59:11 2012 +0100

    update iwhd.spec for iwhd-1.4; update patch1

 iwhd-1.0-debug.patch |   41 ++++++++++++++++++++++-------------------
 iwhd.spec            |   22 +++++++++++++++-------
 2 files changed, 37 insertions(+), 26 deletions(-)
---
diff --git a/iwhd-1.0-debug.patch b/iwhd-1.0-debug.patch
index bac16b9..0bc1c95 100644
--- a/iwhd-1.0-debug.patch
+++ b/iwhd-1.0-debug.patch
@@ -24,39 +24,42 @@ iwhd: failed to start daemon: Address already in use
 curl: (56) Recv failure: Connection reset by peer
 Tue Nov 22 04:16:39 got kill or ctrl c or hup signal 15 (Terminated), will terminate after current cmd ends
 
-diff -ur iwhd-1.0~/t/auto iwhd-1.0/t/auto
---- iwhd-1.0~/t/auto	2011-10-20 03:22:07.000000000 -0600
-+++ iwhd-1.0/t/auto	2011-11-21 22:55:46.217143746 -0700
+diff --git a/t/auto b/t/auto
+index 5f7092d..01a2fb8 100755
+--- a/t/auto
++++ b/t/auto
 @@ -5,7 +5,7 @@
- 
+
  mkdir FS mongod iwhd || framework_failure_ mkdir failed
- 
+
 -port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
 +port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
  m_port=27018 # auto-start default
- 
+
  printf '[{"path": "FS", "type": "fs", "name": "primary"}]\n' \
-diff -ur iwhd-1.0~/t/oauth iwhd-1.0/t/oauth
---- iwhd-1.0~/t/oauth	2011-10-20 12:13:00.000000000 -0600
-+++ iwhd-1.0/t/oauth	2011-11-21 22:56:39.865473050 -0700
-@@ -25,7 +25,7 @@
- wait_for .1 50 'mongo localhost:$m_port < /dev/null' \
+diff --git a/t/oauth b/t/oauth
+index 8dde2ef..e39f374 100755
+--- a/t/oauth
++++ b/t/oauth
+@@ -25,7 +25,7 @@ cleanup_() { kill -9 $mongo_pid; }
+ wait_for_mongo $m_port \
    || framework_failure_ mongod failed to start
- 
+
 -port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
 +port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
- 
+
  ulimit -c unlimited
- 
-diff -ur iwhd-1.0~/t/registration iwhd-1.0/t/registration
---- iwhd-1.0~/t/registration	2011-04-11 09:37:07.000000000 -0600
-+++ iwhd-1.0/t/registration	2011-11-21 22:56:21.523702357 -0700
+
+diff --git a/t/registration b/t/registration
+index a1114cd..b410ca5 100755
+--- a/t/registration
++++ b/t/registration
 @@ -7,7 +7,7 @@
  mkdir -p reg/mongod reg/_fs reg/condor/staging \
    || framework_failure_ mkdir failed
- 
+
 -port=$(get_port 9095 $lock_dir/i-) || fail_ "failed to get iwhd port"
 +port=$(get_port 9091 $lock_dir/i-) || fail_ "failed to get iwhd port"
  m_port=$(get_port $mongo_base_port $lock_dir/m-) \
    || fail_ "failed to get mongodb port"
- 
+
diff --git a/iwhd.spec b/iwhd.spec
index 223319c..695d074 100644
--- a/iwhd.spec
+++ b/iwhd.spec
@@ -1,6 +1,6 @@
 Name:		iwhd
-Version:	1.1
-Release:	2%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	Image WareHouse Daemon
 
 Group:		System Environment/Libraries
@@ -30,8 +30,11 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: help2man
 
-# this defines %{_unitdir}
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
 BuildRequires: systemd-units
+%else
+%define _unitdir /lib/systemd/system
+%endif
 
 # mongodb-server is required at build time so make check succeeds
 BuildRequires: mongodb-server
@@ -53,14 +56,11 @@ make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 %check
-#make -s check
 make %{?_smp_mflags} check VERBOSE=yes
 
 %clean
 rm -rf %{buildroot}
 
-%post
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
@@ -68,7 +68,6 @@ rm -rf %{buildroot}
 %{_bindir}/dc-rhev-image
 %{_bindir}/dc-vmware-image
 %{_mandir}/man8/iwhd.8*
-%{_sysconfdir}/rc.d/init.d/iwhd
 %config(noreplace)	%{_sysconfdir}/iwhd/conf.js
 %config(noreplace)	%{_sysconfdir}/iwhd/users.js
 %config(noreplace)	%{_sysconfdir}/logrotate.d/iwhd
@@ -76,7 +75,16 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/iwhd
 %{_unitdir}/iwhd.service
 
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
+# nothing required here
+%else
+%{_sysconfdir}/rc.d/init.d/iwhd
+%endif
+
 %changelog
+* Mon Mar  5 2012 Jim Meyering <meyering at redhat.com> - 1.4-1
+- use just-released upstream iwhd-1.4, but disable the pesky t/auto test
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild