[libkolab] 0.5.1-1

[Rex Dieter]

commit e6105aaa730002da5873b53d1ab4dccb94442e1e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jul 2 21:16:27 2014 -0500

    0.5.1-1
    
    - libkolab-0.5.1
    - s/python-devel/python2-devel/, s/qt-devel/qt4-devel/

 .gitignore    |    2 +-
 libkolab.spec |   53 ++++++++++++++++++++++++++---------------------------
 sources       |    2 +-
 3 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 368f06b..f505c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libkolab-0.5.0.tar.gz
+/libkolab-0.5.1.tar.gz
diff --git a/libkolab.spec b/libkolab.spec
index 70c4038..212eb35 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -5,10 +5,11 @@
 # 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 %{python2_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
+
 %if "%{php_version}" < "5.6"
 %global ini_name     kolab.ini
 %else
@@ -16,8 +17,8 @@
 %endif
 
 Name:           libkolab
-Version:        0.5.0
-Release:        4%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
@@ -25,9 +26,6 @@ URL:            http://git.kolab.org/libkolab
 
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
-# Fix #2588: kolabformatchecker uses kolab_static instead of kolab
-Patch0:         libkolab-0.5.0_kolab_static.patch
-
 BuildRequires:  cmake
 %if 0%{?rhel} > 6 || 0%{?fedora} > 16
 BuildRequires:  kdepimlibs-devel >= 4.9
@@ -40,8 +38,8 @@ BuildRequires:  libcurl-devel
 BuildRequires:  libkolabxml-devel >= 1.0
 BuildRequires:  php >= 5.3
 BuildRequires:  php-devel >= 5.3
-BuildRequires:  python-devel
-BuildRequires:  qt-devel
+BuildRequires:  python2-devel
+BuildRequires:  qt4-devel
 
 %description
 The libkolab library is an advanced library to  handle Kolab objects.
@@ -58,8 +56,7 @@ BuildRequires:  libcalendaring-devel >= 4.9
 %endif
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
-Requires:       pkgconfig
-Requires:       python-devel
+Requires:       python2-devel
 
 %description devel
 Development headers for the Kolab object libraries.
@@ -87,7 +84,6 @@ Python bindings for libkolab
 
 %prep
 %setup -q -n libkolab-%{version}
-%patch0 -p0
 
 %build
 mkdir -p build
@@ -101,7 +97,7 @@ pushd build
     -DPHP_BINDINGS=ON \
     -DPHP_INSTALL_DIR=%{php_extdir} \
     -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
+    -DPYTHON_INSTALL_DIR=%{python2_sitearch} \
     ..
 make
 popd
@@ -121,7 +117,7 @@ extension=kolabcalendaring.so
 extension=kolabicalendar.so
 EOF
 
-touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
+touch %{buildroot}/%{python2_sitearch}/kolab/__init__.py
 
 %check
 pushd build/tests
@@ -139,13 +135,12 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%{_libdir}/libkolab.so.0
-%{_libdir}/libkolab.so.%{version}
+%{_libdir}/libkolab.so.0*
 
 %files devel
 %{_libdir}/libkolab.so
-%{_libdir}/cmake/Libkolab
-%{_includedir}/kolab
+%{_libdir}/cmake/Libkolab/
+%{_includedir}/kolab/
 
 %files -n php-kolab
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -159,18 +154,22 @@ popd
 %{php_extdir}/kolabshared.so
 
 %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 %{python2_sitearch}/kolab/
+%{python2_sitearch}/kolab/__init__.py*
+%{python2_sitearch}/kolab/_calendaring.so
+%{python2_sitearch}/kolab/calendaring.py*
+%{python2_sitearch}/kolab/_icalendar.so
+%{python2_sitearch}/kolab/icalendar.py*
+%{python2_sitearch}/kolab/_kolabobject.so*
+%{python2_sitearch}/kolab/kolabobject.py*
+%{python2_sitearch}/kolab/_shared.so*
+%{python2_sitearch}/kolab/shared.py*
 
 %changelog
+* Wed Jul 02 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.5.1-1
+- libkolab-0.5.1
+- s/python-devel/python2-devel/, s/qt-devel/qt4-devel/
+
 * Fri Jun 20 2014 Remi Collet <rcollet at redhat.com> - 0.5.0-4
 - rebuild for https://fedoraproject.org/wiki/Changes/Php56
 - add numerical prefix to extension configuration file
diff --git a/sources b/sources
index f56b689..ef5df86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38da4b0918e8585ab935ae02bc321aa0  libkolab-0.5.0.tar.gz
+de9674769f4b3b4076e64d4ec391cb6a  libkolab-0.5.1.tar.gz