[imgtarget/f14: 5/5] Merge remote-tracking branch 'origin/f15' into f14

[corsepiu]

commit 173d44676e6bf135bac9c61850f5f28922c7df56
Merge: d47db53 43c1ca2
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Jun 30 17:22:05 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

 imgtarget.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc imgtarget.spec
index 02c8d73,026b834..829ae05
--- a/imgtarget.spec
+++ b/imgtarget.spec
@@@ -72,10 -72,16 +72,13 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
+ * Thu Jun 30 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.1.4-7
+ - Fix up broken spec-changelog entry.
+ 
  * Thu Jun 30 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.1.4-6
- - Append INCLUDES="-I/usr/include/netpbm" and LIBS="-lX11" to %configure
+ - Append INCLUDES="-I/usr/include/netpbm" and LIBS="-lX11" to %%configure
    (Fix FTBFS BZ#599895, BZ#715981).
  
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild