[iwhd/f16: 14/14] merge from master for iwhd-1.5

[Jim Meyering]

commit 615dccaf09ed743a23e7d3d9e9135872cc9e2699
Merge: dddb461 81c3ff5
Author: Jim Meyering <meyering at redhat.com>
Date:   Mon Mar 12 11:25:48 2012 +0100

    merge from master for iwhd-1.5

 .gitignore               |    1 +
 iwhd.service             |   14 ++++++++++++++
 iwhd.spec                |    7 ++++---
 sources                  |    2 +-
 systemd-f16-vs-f17.patch |   21 +++++++++++++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 902ddb9,50c25b4..178330e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,6 +1,9 @@@
  /iwhd-0.96.tar.xz
  /iwhd-0.990.tar.xz
 +/iwhd-0.991.tar.xz
  /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
+ /iwhd-1.5.tar.xz
diff --cc iwhd.spec
index 6690460,b952df3..f6578b3
--- a/iwhd.spec
+++ b/iwhd.spec
@@@ -82,19 -80,19 +80,22 @@@ rm -rf %{buildroot
  %endif
  
  %changelog
+ * Sat Mar 10 2012 Jim Meyering <meyering at redhat.com> - 1.5-1
 -* Tue Mar  6 2012 Jim Meyering <meyering at redhat.com> - 1.4-1
 -- use just-released upstream iwhd-1.4
 -- also add systemd-f16-vs-f17.patch
++- use just-released upstream iwhd-1.5; no more patches required
+ 
 -* 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
 +* 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
  
 -* Thu Dec  1 2011 Jim Meyering <meyering at redhat.com> - 1.1-1
 +* 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
  
 -* Mon Nov 21 2011 Pete Zaitcev <zaitcev at redhat.com> - 1.0-2
 -- Re-enable build-time check. The 1.0 ought to fix the issue.
 +* Thu Dec  1 2011 Jim Meyering <meyering at redhat.com> - 1.1-1
 +- new release
 +- include Pete's "make check"-enabling patch from rawhide
 +- package iwhd.service
  
  * Thu Oct 31 2011 Jim Meyering <meyering at redhat.com> - 1.0-1
  - new release