[libinfinity: 3/4] Merge remote-tracking branch 'origin/f15'

[Till Maas]

commit bb8a86e551467d2252f56282df6bcecbb8c658f0
Merge: ac8e3b6 e90a43c
Author: Till Maas <opensource at till.name>
Date:   Sun Jul 8 23:58:27 2012 +0200

    Merge remote-tracking branch 'origin/f15'
    
    Conflicts:
    	libinfinity.spec

 .gitignore       |    1 +
 libinfinity.spec |   29 +++++++++++++++++++++--------
 sources          |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)
---
diff --cc libinfinity.spec
index 23748fa,0577808..eaf0fde
--- a/libinfinity.spec
+++ b/libinfinity.spec
@@@ -1,8 -1,8 +1,8 @@@
- %define libversion 0.4
+ %define libversion 0.5
  
  Name:           libinfinity
- Version:        0.4.2
- Release:        4%{?dist}
 -Version:        0.5.0
 -Release:        2%{?dist}
++Version:        0.5.2
++Release:        1%{?dist}
  Summary:        Library implementing the infinote protocol
  
  Group:          System Environment/Libraries
@@@ -19,10 -19,12 +19,12 @@@ BuildRequires:  libgsasl-deve
  BuildRequires:  gtk-doc
  BuildRequires:  chrpath
  BuildRequires:  gettext
- BuildRequires:  gtk2-devel
+ BuildRequires:  gtk3-devel
+ BuildRequires:  pam-devel
+ BuildRequires:  libdaemon-devel
  
  %description
--Libinfinity is used in the collaborative editing tool Kobby.
++libinfinity is an implementation of the Infinote protocol written in GObject-based C. 
  
  
  %package        devel
@@@ -163,12 -166,12 +166,22 @@@ rm -rf %{buildroot
  
  
  %changelog
++* Sun Jul 08 2012 Till Maas <opensource at till.name> - 0.5.2-1
++- Update to new release
++- Update description
++
+ * Tue Apr  5 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.5.0-2
+ - Fix Requires for libinfinity-devel
+ 
+ * Tue Apr  5 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.5.0-1
+ - Update to 0.5.0
+ 
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.4.2-3
 +- Rebuild for new libpng
 +
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild