Branch 'kolab-libs-0.2' - 3 commits - configure.ac kolab-libs.spec.in

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun Mar 25 11:46:56 CEST 2012


 configure.ac       |    4 ++--
 kolab-libs.spec.in |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d2608a55bac43b8cc77739dbe3c6d17a59279538
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Mar 25 11:46:04 2012 +0200

    First released version in the 0.2 series, 0.2.0

diff --git a/configure.ac b/configure.ac
index 8d6a2cc..4b80c7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([kolab-libs], 0.2)
-AC_SUBST([RELEASE], 0.1)
+AC_INIT([kolab-libs], 0.2.0)
+AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(kolab-libs.spec.in)
 


commit 273a54761f5b8f18cea894563c6490325a2ad1f1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Mar 25 11:43:29 2012 +0200

    Define python macros if not already available

diff --git a/kolab-libs.spec.in b/kolab-libs.spec.in
index a57f1c5..7e5d4c9 100644
--- a/kolab-libs.spec.in
+++ b/kolab-libs.spec.in
@@ -1,4 +1,6 @@
 %{!?python_include: %global python_include %{_includedir}/python%(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())")}
 
 Name:           kolab-libs
 Version:        @VERSION@


commit a5880768d510c945bdc130d26b322cf35acd5388
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Mar 24 14:25:52 2012 +0100

    Make sure we require php-devel >= 5.3

diff --git a/kolab-libs.spec.in b/kolab-libs.spec.in
index b4d1ca7..a57f1c5 100644
--- a/kolab-libs.spec.in
+++ b/kolab-libs.spec.in
@@ -26,7 +26,7 @@ BuildRequires:  kdepimlibs-devel
 %if 0%{?rhel} > 5
 BuildRequires:  libuuid-devel
 %endif
-BuildRequires:  php-devel
+BuildRequires:  php-devel >= 5.3
 BuildRequires:  python-devel
 BuildRequires:  qt-devel >= 3
 BuildRequires:  swig





More information about the commits mailing list