[libkolab: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolab

[Jeroen van Meeuwen]

commit 87b5d1f006ce3f836fc365492d47a2a8a331c11c
Merge: a56aec4 0dd9e55
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Jul 29 18:07:44 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolab
    
    Conflicts:
    	libkolab.spec

 libkolab.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc libkolab.spec
index 5f8618c,ee675db..116a47e
--- a/libkolab.spec
+++ b/libkolab.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           libkolab
  Version:        0.3
--Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        Kolab Object Handling Library
  
  License:        LGPLv3+
@@@ -118,25 -60,10 +118,28 @@@ rm -rf %{buildroot
  %{_libdir}/cmake/Libkolab
  %{_includedir}/kolab
  
 +%files -n php-kolab
 +%{php_extdir}/calendaring.php
 +%{php_extdir}/calendaring.so
 +%{php_extdir}/icalendar.php
 +%{php_extdir}/icalendar.so
 +
 +%files -n python-kolab
 +%{python_sitearch}/_calendaring.so
 +%{python_sitearch}/calendaring.py*
 +%{python_sitearch}/_icalendar.so
 +%{python_sitearch}/icalendar.py*
 +
  %changelog
- * Sat Jul 28 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-6
++* Sun Jul 29 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-7
 +- Ship PHP and Python bindings
 +- Conditionally build with libcalendaring
 +- Execute tests
 +- Correct installation directory for headers
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jun 26 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-5
  - Fix some review issues (#833853)
  - Rebuild after some packaging fixes (4)