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

[Jeroen van Meeuwen]

commit 1edbaec1581aa7043b1b7552d357bd141d2e4fc7
Merge: 14d0da7 06b3875
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Aug 15 16:25:00 2012 +0100

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

 libkolab.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc libkolab.spec
index 4faa7c9,0801bfc..e7ca6b7
--- a/libkolab.spec
+++ b/libkolab.spec
@@@ -1,16 -1,6 +1,16 @@@
 +%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d/}
 +
 +# Filter out private python and php libs. Does not work on EPEL5,
 +# therefor we use it conditionally
 +%{?filter_setup:
 +%filter_provides_in %{python_sitearch}/.*\.so$
 +%filter_provides_in %{php_extdir}/.*\.so$
 +%filter_setup
 +}
 +
  Name:           libkolab
 -Version:        0.3
 -Release:        8%{?dist}
 +Version:        0.3.1
- Release:        1%{?dist}
++Release:        2%{?dist}
  Summary:        Kolab Object Handling Library
  
  License:        LGPLv3+
@@@ -139,28 -119,22 +139,33 @@@ rm -rf %{buildroot
  %{_includedir}/kolab
  
  %files -n php-kolab
 -%{php_extdir}/calendaring.php
 -%{php_extdir}/calendaring.so
 -%{php_extdir}/icalendar.php
 -%{php_extdir}/icalendar.so
 +%config(noreplace) %{php_inidir}/kolab.ini
 +%{_datadir}/php/kolabcalendaring.php
 +%{php_extdir}/kolabcalendaring.so
 +%{_datadir}/php/kolabicalendar.php
 +%{php_extdir}/kolabicalendar.so
 +%{_datadir}/php/kolabshared.php
 +%{php_extdir}/kolabshared.so
  
  %files -n python-kolab
 -%{python_sitearch}/_calendaring.so
 -%{python_sitearch}/calendaring.py*
 -%{python_sitearch}/_icalendar.so
 -%{python_sitearch}/icalendar.py*
 +%{python_sitearch}/kolab/_calendaring.so
 +%{python_sitearch}/kolab/calendaring.py*
 +%{python_sitearch}/kolab/_icalendar.so
 +%{python_sitearch}/kolab/icalendar.py*
 +%{python_sitearch}/kolab/_shared.so*
 +%{python_sitearch}/kolab/shared.py*
  
  %changelog
 -* Tue Aug 14 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.3-8
 -- Rebuild for new boost
++* Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-2
++- Merge back with Fedora,
++- Rebuilt for boost (Christoph Wickert, 0.3-10)
++
 +* Wed Aug  8 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-1
++- New upstream version 0.3.1
 +- Correct locations and naming of PHP bindings modules
  
 -* Sun Jul 29 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-7
 +* Thu Aug  2 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-9
 +- New snapshot
  - Ship PHP and Python bindings
  - Conditionally build with libcalendaring
  - Execute tests