[libzeitgeist: 2/2] Merge branch 'f18'

[Rex Dieter]

commit 41bc7f6837b1fb8e130476b51b35bc6b8a64db9e
Merge: 67ba401 db4b20c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Feb 20 08:17:24 2013 -0600

    Merge branch 'f18'
    
    Conflicts:
    	libzeitgeist.spec

 libzeitgeist.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --cc libzeitgeist.spec
index 052683d,b8ee96d..f370244
--- a/libzeitgeist.spec
+++ b/libzeitgeist.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           libzeitgeist
  Version:        0.3.18
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        Client library for applications that want to interact with the Zeitgeist daemon
  
  Group:          System Environment/Libraries
@@@ -86,9 -84,9 +84,12 @@@ rm -fr %{buildroot}%{_defaultdocdir}/%{
  
  
  %changelog
- * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.18-3
++* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.18-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
+ * Wed Oct 03 2012 Renich Bon Ciric <renich at woralelandia.com> - 0.3.18-3
+ - removed require on Zeitgeist
+ 
  * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.18-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild