[iwhd/f16] update iwhd.spec for iwhd-1.4, and use patch1 again

[Jim Meyering]

commit dddb4613f92974ed4e46e9bd3162efc4cd84ec50
Author: Jim Meyering <meyering at redhat.com>
Date:   Mon Mar 5 19:14:19 2012 +0100

    update iwhd.spec for iwhd-1.4, and use patch1 again

 .gitignore           |    2 ++
 iwhd-1.0-debug.patch |   41 ++++++++++++++++++++++-------------------
 iwhd.spec            |    8 ++++++--
 sources              |    2 +-
 4 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9b81ff..902ddb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /iwhd-1.0.tar.xz
 /iwhd-1.1.tar.xz
 /iwhd-1.2.tar.xz
+/iwhd-1.3.tar.xz
+/iwhd-1.4.tar.xz
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 80b27aa..6690460 100644
--- a/iwhd.spec
+++ b/iwhd.spec
@@ -1,5 +1,5 @@
 Name:		iwhd
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 Summary:	Image WareHouse Daemon
 
@@ -44,6 +44,7 @@ The image-warehouse daemon for Aeolus
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -55,7 +56,7 @@ make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 %check
-make -j1 check VERBOSE=yes
+make %{?_smp_mflags} check VERBOSE=yes
 
 %clean
 rm -rf %{buildroot}
@@ -81,6 +82,9 @@ rm -rf %{buildroot}
 %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 Mar  2 2012 Jim Meyering <meyering at redhat.com> - 1.3-1
 - use just-released upstream iwhd-1.3
 
diff --git a/sources b/sources
index 7ad1577..9163ab4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b97783a98440dbfdea81e690290feb2  iwhd-1.2.tar.xz
+d196ff41735d8b764cf208e40e6dd875  iwhd-1.4.tar.xz