[iwhd] update iwhd.spec for iwhd-1.4

[Jim Meyering]

commit 6af8d65383eb6c21cf32b197650ca0b28ba27dfe
Author: Jim Meyering <meyering at redhat.com>
Date:   Tue Mar 6 16:13:33 2012 +0100

    update iwhd.spec for iwhd-1.4

 .gitignore |    1 +
 iwhd.spec  |   22 +++++++++++++++-------
 sources    |    2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90141e6..33c5ce8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /iwhd-0.990.tar.xz
 /iwhd-1.0.tar.xz
 /iwhd-1.1.tar.xz
+/iwhd-1.4.tar.xz
diff --git a/iwhd.spec b/iwhd.spec
index 223319c..774bc78 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
+* Tue Mar  6 2012 Jim Meyering <meyering at redhat.com> - 1.4-1
+- use just-released upstream iwhd-1.4
+
 * 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
 
diff --git a/sources b/sources
index f18ec19..9163ab4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c449a9eed2bfd614a52f4431733f40ae  iwhd-1.1.tar.xz
+d196ff41735d8b764cf208e40e6dd875  iwhd-1.4.tar.xz