[gypsy: 3/3] fix merge

[Peter Robinson]

commit 6087c1c3be87110ba15bc94b6d23df70647cd5af
Merge: ee068c1 7cd7958
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 11 15:37:45 2011 +0100

    fix merge

 gypsy-0.8-unusedvar.patch |   14 ++++++++++++++
 gypsy.spec                |    5 +++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --cc gypsy.spec
index 2a07be9,8d5017a..5cbe3c8
--- a/gypsy.spec
+++ b/gypsy.spec
@@@ -76,9 -82,9 +78,12 @@@ rm $RPM_BUILD_ROOT%{_libdir}/libgypsy.l
  %doc %{_datadir}/gtk-doc/html/gypsy
  
  %changelog
 +* Sat Jun 11 2010 Peter Robinson <pbrobinson at gmail.com> 0.8-4
 +- Cleanup spec, drop unncessary gtk-doc dep - fixes RHBZ 707562
 +
+ * Sun Mar 13 2011 Karsten Hopp <karsten at redhat.com> 0.8-3
+ - fix build problem with latest gcc (unused variable)
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild