[iwhd/f16] update iwhd.spec from iwhd-1.3

[Jim Meyering]

commit 0da8d69b6481352fd2d6ea004d33209b1e55dab9
Author: Jim Meyering <meyering at redhat.com>
Date:   Fri Mar 2 19:16:49 2012 +0100

    update iwhd.spec from iwhd-1.3

 iwhd.spec |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/iwhd.spec b/iwhd.spec
index c1959fe..80b27aa 100644
--- a/iwhd.spec
+++ b/iwhd.spec
@@ -1,5 +1,5 @@
 Name:		iwhd
-Version:	1.2
+Version:	1.3
 Release:	1%{?dist}
 Summary:	Image WareHouse Daemon
 
@@ -30,9 +30,10 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: help2man
 
-# this defines %{_unitdir}
-%if 0%{?fedora} >= 16
+%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
@@ -43,7 +44,6 @@ The image-warehouse daemon for Aeolus
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure
@@ -55,13 +55,11 @@ make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 %check
-make %{?_smp_mflags} check VERBOSE=yes
+make -j1 check VERBOSE=yes
 
 %clean
 rm -rf %{buildroot}
 
-%post
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
@@ -69,20 +67,23 @@ 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
 %config(noreplace)	%{_sysconfdir}/sysconfig/iwhd
 %{_localstatedir}/lib/iwhd
-
-%if 0%{?fedora} >= 16
 %{_unitdir}/iwhd.service
+
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
+# nothing required here
 %else
-/lib/systemd/system/iwhd.service
+%{_sysconfdir}/rc.d/init.d/iwhd
 %endif
 
 %changelog
+* Fri Mar  2 2012 Jim Meyering <meyering at redhat.com> - 1.3-1
+- use just-released upstream iwhd-1.3
+
 * Tue Dec  6 2011 Jim Meyering <meyering at redhat.com> - 1.2-1
 - new release