Kolab Groupware OBS

Changes of Revision 47

libkolab.spec Changed

@@ -20,7 +20,7 @@
 # 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 %{python3_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
@@ -41,8 +41,8 @@
 # From 2881447555eb7965f557158c88ae2aa18e936971
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
-#Patch1:         0001-Fix-dangling-pointers.patch
-#Patch2:         0002-Fixed-memory-leaks-in-tests.patch
+Patch1:         0001-Fix-dangling-pointers.patch
+Patch2:         0002-Fixed-memory-leaks-in-tests.patch
 
 BuildRequires:  cmake
 %if 0%{?rhel} > 7 || 0%{?fedora}
@@ -280,7 +280,7 @@
     -DPHP_BINDINGS=ON \
     -DPHP_INSTALL_DIR=%{php_extdir} \
     -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
+    -DPYTHON_INSTALL_DIR=%{python3_sitearch} \
     ..
 make
 popd
@@ -334,7 +334,6 @@
 extension=kolabobject.so
 extension=kolabshared.so
 extension=kolabcalendaring.so
-extension=kolabicalendar.so
 EOF
 
 # Workaround for #2050
@@ -362,7 +361,6 @@
     echo "extension=kolabobject.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabshared.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabcalendaring.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
-    echo "extension=kolabicalendar.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=dummy.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabdummy.ini
 
     cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini \
@@ -375,7 +373,7 @@
 done
 %endif
 
-touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
+touch %{buildroot}/%{python3_sitearch}/kolab/__init__.py
 
 %check
 pushd %{name}-%{version}/build/tests
@@ -413,8 +411,6 @@
 %config(noreplace) %{php_inidir}/kolabdummy.ini
 %{_datadir}/%{php}/kolabcalendaring.php
 %{php_extdir}/kolabcalendaring.so
-%{_datadir}/%{php}/kolabicalendar.php
-%{php_extdir}/kolabicalendar.so
 %{_datadir}/%{php}/kolabobject.php
 %{php_extdir}/kolabobject.so
 %{_datadir}/%{php}/kolabshared.php
@@ -467,16 +463,14 @@
 %endif
 
 %files -n python-kolab
-%dir %{python_sitearch}/kolab/
-%{python_sitearch}/kolab/__init__.py*
-%{python_sitearch}/kolab/_calendaring.so
-%{python_sitearch}/kolab/calendaring.py*
-%{python_sitearch}/kolab/_icalendar.so
-%{python_sitearch}/kolab/icalendar.py*
-%{python_sitearch}/kolab/_kolabobject.so*
-%{python_sitearch}/kolab/kolabobject.py*
-%{python_sitearch}/kolab/_shared.so*
-%{python_sitearch}/kolab/shared.py*
+%dir %{python3_sitearch}/kolab/
+%{python3_sitearch}/kolab/__init__.py*
+%{python3_sitearch}/kolab/_calendaring.so
+%{python3_sitearch}/kolab/calendaring.py*
+%{python3_sitearch}/kolab/_kolabobject.so*
+%{python3_sitearch}/kolab/kolabobject.py*
+%{python3_sitearch}/kolab/_shared.so*
+%{python3_sitearch}/kolab/shared.py*
 
 %changelog
 * Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net>