Check in new upstream version 0.8.1

This commit is contained in:
Jeroen van Meeuwen (Kolab Systems) 2012-08-15 15:52:35 +01:00
parent 9f4a4daf0f
commit 962f07d476
3 changed files with 120 additions and 5 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/libkolabxml-0.7.0.tar.gz
/libkolabxml-0.8.tar.gz
/libkolabxml-0.8.0.tar.gz
/libkolabxml-0.8.1.tar.gz

View File

@ -1,18 +1,44 @@
%global with_csharp 1
%global with_java 1
%global with_php 1
%global with_python 1
%if 0%{?with_php} > 0
%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d/}
%{?el5: %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
%endif
%if 0%{?with_python} > 0
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif
# Filter out private python and php libs. Does not work on EPEL5,
# therefor we use it conditionally
%if 0%{?with_php} > 0
%if 0%{?with_python} > 0
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_provides_in %{php_extdir}/.*\.so$
%filter_setup
}
%else
%{?filter_setup:
%filter_provides_in %{php_extdir}/.*\.so$
%filter_setup
}
%endif
%else
%if 0%{?with_python} > 0
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_setup
}
%endif
%endif
Name: libkolabxml
Version: 0.8.0
Version: 0.8.1
Release: 1%{?dist}
Summary: Kolab XML format collection parser library
@ -37,8 +63,6 @@ BuildRequires: kdelibs-devel
BuildRequires: kdepimlibs-devel
%endif
BuildRequires: libcurl-devel
BuildRequires: php-devel >= 5.3
BuildRequires: python-devel
BuildRequires: qt-devel >= 3
BuildRequires: swig
BuildRequires: uuid-devel
@ -48,6 +72,26 @@ BuildRequires: xsd
# Only valid in kolabsys.com Koji
#BuildRequires: xsd-utils
%if 0%{?with_csharp} < 1
Obsoletes: csharp-kolabformat < %{version}-%{release}
Provides: csharp-kolabformat = %{version}-%{release}
%endif
%if 0%{?with_java} < 1
Obsoletes: java-kolabformat < %{version}-%{release}
Provides: java-kolabformat = %{version}-%{release}
%endif
%if 0%{?with_php} < 1
Obsoletes: php-kolabformat < %{version}-%{release}
Provides: php-kolabformat = %{version}-%{release}
%endif
%if 0%{?with_python} < 1
Obsoletes: python-kolabformat < %{version}-%{release}
Provides: python-kolabformat = %{version}-%{release}
%endif
%description
The libkolabxml parsing library interprets Kolab XML formats (xCal, xCard)
with bindings for Python, PHP and other languages. The language bindings
@ -70,8 +114,12 @@ Requires: kdelibs-devel
Requires: kdepimlibs-devel
%endif
Requires: libcurl-devel
%if 0%{?with_php} > 0
Requires: php-devel >= 5.3
%endif
%if 0%{?with_python} > 0
Requires: python-devel
%endif
Requires: qt-devel >= 3
Requires: swig
Requires: uuid-devel
@ -84,6 +132,28 @@ Requires: xsd
%description devel
Development headers for the Kolab XML libraries.
%if 0%{?with_csharp} > 0
%package -n csharp-kolabformat
Summary: C# Bindings for libkolabxml
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: mono-core
%description -n csharp-kolabformat
C# bindings for libkolabxml
%endif
%if 0%{?with_java} > 0
%package -n java-kolabformat
Summary: Java Bindings for libkolabxml
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n java-kolabformat
Java bindings for libkolabxml
%endif
%if 0%{?with_php} > 0
%package -n php-kolabformat
Summary: PHP bindings for libkolabxml
Group: System Environment/Libraries
@ -94,19 +164,24 @@ Requires: php(api) = %{php_core_api}
%else
Requires: php-api = %{php_apiver}
%endif
BuildRequires: php-devel >= 5.3
%description -n php-kolabformat
The PHP kolabformat package offers a comprehensible PHP library using the
bindings provided through libkolabxml.
%endif
%if 0%{?with_python} > 0
%package -n python-kolabformat
Summary: Python bindings for libkolabxml
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: python-devel
%description -n python-kolabformat
The PyKolab format package offers a comprehensive Python library using the
bindings provided through libkolabxml.
%endif
%prep
%setup -q
@ -124,11 +199,23 @@ pushd build
-DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
%endif
-DINCLUDE_INSTALL_DIR=%{_includedir} \
-DPYTHON_INCLUDE_DIRS=%{python_include} \
%if 0%{?with_csharp} > 0
-DCSHARP_BINDINGS=ON \
-DCSHARP_INSTALL_DIR=%{_datadir}/%{name}/csharp/ \
%endif
%if 0%{?with_java} > 0
-DJAVA_BINDINGS=ON \
-DJAVA_INSTALL_DIR=%{_datadir}/%{name}/java/ \
%endif
%if 0%{?with_php} > 0
-DPHP_BINDINGS=ON \
-DPHP_INSTALL_DIR=%{php_extdir} \
%endif
%if 0%{?with_python} > 0
-DPYTHON_BINDINGS=ON \
-DPYTHON_INCLUDE_DIRS=%{python_include} \
-DPYTHON_INSTALL_DIR=%{python_sitearch} \
%endif
..
make
popd
@ -139,6 +226,7 @@ pushd build
make install DESTDIR=%{buildroot} INSTALL='install -p'
popd
%if 0%{?with_php} > 0
mkdir -p %{buildroot}/%{_datadir}/php
mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/php/kolabformat.php
@ -146,6 +234,7 @@ mkdir -p %{buildroot}/%{php_inidir}/
cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF
extension=kolabformat.so
EOF
%endif
%check
pushd build
@ -156,8 +245,12 @@ pushd tests
./conversiontest ||:
./parsingtest ||:
popd
%if 0%{?with_php} > 0
php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
%endif
%if 0%{?with_python} > 0
python src/python/test.py ||:
%endif
popd
%clean
@ -178,18 +271,39 @@ rm -rf %{buildroot}
%{_libdir}/*.so
%{_libdir}/cmake/Libkolabxml
%if 0%{?with_csharp} > 0
%files -n csharp-kolabformat
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/csharp
%endif
%if 0%{?with_java} > 0
%files -n java-kolabformat
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/java
%endif
%if 0%{?with_php} > 0
%files -n php-kolabformat
%defattr(-,root,root,-)
%config(noreplace) %{php_inidir}/kolabformat.ini
%{_datadir}/php/kolabformat.php
%{php_extdir}/kolabformat.so
%endif
%if 0%{?with_python} > 0
%files -n python-kolabformat
%defattr(-,root,root,-)
%{python_sitearch}/kolabformat.py*
%{python_sitearch}/_kolabformat.so
%endif
%changelog
* Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.1-1
- New upstream version 0.8.1
* Fri Aug 3 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.0-1
- New upstream version 0.8.0

View File

@ -1 +1 @@
7f36fcacc8bd6f2e9574cf453e758ec8 libkolabxml-0.8.0.tar.gz
a02541b35153334c69ee1845dfe464c6 libkolabxml-0.8.1.tar.gz