[iwhd/f16] include Pete's make-check-enabling patch from master

[Jim Meyering]

commit 1cf32dcd1b3e53ee4a7594b564e898b678ef1a54
Author: Pete Zaitcev <zaitcev at yahoo.com>
Date:   Mon Nov 21 23:26:37 2011 -0700

    include Pete's make-check-enabling patch from master

 iwhd-1.0-debug.patch |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 iwhd.spec            |    6 +++-
 2 files changed, 66 insertions(+), 2 deletions(-)
---
diff --git a/iwhd-1.0-debug.patch b/iwhd-1.0-debug.patch
new file mode 100644
index 0000000..bac16b9
--- /dev/null
+++ b/iwhd-1.0-debug.patch
@@ -0,0 +1,62 @@
+Chasing the mysterious failure at 9102. Something is listening there.
+
++ eval 'curl -s http://localhost:9102'
+++ curl -s http://localhost:9102
+++ env curl -q -s -S -s http://localhost:9102
+Nov 22 04:16:39 iwhd[2494]: trying to connect to mongod (host 127.0.0.1 port 27018) ...
+Nov 22 04:16:39 iwhd[2494]: mongod went up after 1 s
+Nov 22 04:16:39 iwhd[2494]: mongod listens on port 27018
+Tue Nov 22 04:16:39 [initandlisten] connection accepted from 127.0.0.1:37009 #2
+Nov 22 04:16:39 iwhd[2494]: convert-provider: ITER key: name
+Nov 22 04:16:39 iwhd[2494]: convert-provider: ITER key: type
+Nov 22 04:16:39 iwhd[2494]: convert-provider: ITER key: path
+Nov 22 04:16:39 iwhd[2494]: changing directory to _fs
+Initializing...
+0 replication servers defined
+auto-start in effect
+primary store type is fs
+db is at localhost:27018
+will listen on port 9102
+my location is "fs_autostart"
+Tue Nov 22 04:16:39 [conn2] end connection 127.0.0.1:37009
+Tue Nov 22 04:16:39 [initandlisten] connection accepted from 127.0.0.1:37011 #3
+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
+@@ -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' \
+   || 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
+@@ -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 0d20192..4f7fe41 100644
--- a/iwhd.spec
+++ b/iwhd.spec
@@ -11,6 +11,7 @@ URL:		http://git.fedorahosted.org/git/?p=iwhd.git
 ExcludeArch: ppc ppc64 s390 s390x
 
 Source0: http://people.redhat.com/meyering/iwhd/%{name}-%{version}.tar.xz
+Patch1: iwhd-1.0-debug.patch
 
 BuildRequires: boost-devel
 BuildRequires: boost-filesystem
@@ -37,6 +38,7 @@ The image-warehouse daemon for Aeolus
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -48,7 +50,7 @@ make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 %check
-#make -s check
+make check VERBOSE=yes
 
 %clean
 rm -rf %{buildroot}
@@ -71,7 +73,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Thu Dec  1 2011 Jim Meyering <meyering at redhat.com> - 1.1-1
-- new release
+- new release, with Pete's "make check"-enabling patch from rawhide
 
 * Thu Oct 31 2011 Jim Meyering <meyering at redhat.com> - 1.0-1
 - new release