[libkolab: 6/8] Check in version 0.3.1

[Jeroen van Meeuwen]

commit 14d0da7b006d24597d523b22958096ece9d94d5d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Aug 8 14:48:09 2012 +0100

    Check in version 0.3.1

 .gitignore    |    1 +
 libkolab.spec |   25 +++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 982a49e..2905849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libkolab-0.2.0.tar.gz
 /libkolab-0.3.tar.gz
 /libkolab-0.3.0.tar.gz
+/libkolab-0.3.1.tar.gz
diff --git a/libkolab.spec b/libkolab.spec
index bba271d..4faa7c9 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -9,7 +9,7 @@
 }
 
 Name:           libkolab
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        Kolab Object Handling Library
 
@@ -101,12 +101,14 @@ make install DESTDIR=%{buildroot}
 popd
 
 mkdir -p %{buildroot}/%{_datadir}/php
-mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/php/.
+mv %{buildroot}/%{php_extdir}/kolab/*.php %{buildroot}/%{_datadir}/php/.
+mv %{buildroot}/%{php_extdir}/kolab/*.so %{buildroot}/%{php_extdir}/.
 
 mkdir -p %{buildroot}/%{php_inidir}
 cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF
-extension=kolab-calendaring.so
-extension=kolab-icalendar.so
+extension=kolabcalendaring.so
+extension=kolabicalendar.so
+extension=kolabshared.so
 EOF
 
 %check
@@ -138,18 +140,25 @@ rm -rf %{buildroot}
 
 %files -n php-kolab
 %config(noreplace) %{php_inidir}/kolab.ini
-%{_datadir}/php/calendaring.php
-%{php_extdir}/kolab-calendaring.so
-%{_datadir}/php/icalendar.php
-%{php_extdir}/kolab-icalendar.so
+%{_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}/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
+* Wed Aug  8 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-1
+- Correct locations and naming of PHP bindings modules
+
 * Thu Aug  2 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-9
 - New snapshot
 - Ship PHP and Python bindings
diff --git a/sources b/sources
index 9c68179..bc183a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fce7cbbace0c813f1d9d621d9f8fee6  libkolab-0.3.0.tar.gz
+369e5d706e83564a5568107ce0f10891  libkolab-0.3.1.tar.gz