1.1.4
This commit is contained in:
Rex Dieter
parent
0cbd50233a
commit
42ce42c8cc
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/libkolabxml-1.0.3.tar.gz
|
||||
/libkolabxml-1.1.4.tar.gz
|
||||
|
||||
@ -20,17 +20,12 @@
|
||||
%endif
|
||||
%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 %{python2_sitearch}/.*\.so$
|
||||
%filter_provides_in %{php_extdir}/.*\.so$
|
||||
%filter_setup
|
||||
}
|
||||
@ -43,35 +38,29 @@
|
||||
%else
|
||||
%if 0%{?with_python} > 0
|
||||
%{?filter_setup:
|
||||
%filter_provides_in %{python_sitearch}/.*\.so$
|
||||
%filter_provides_in %{python2_sitearch}/.*\.so$
|
||||
%filter_setup
|
||||
}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Name: libkolabxml
|
||||
Version: 1.0.3
|
||||
Release: 8%{?dist}
|
||||
Version: 1.1.4
|
||||
Release: 0.1%{?dist}
|
||||
Summary: Kolab XML format collection parser library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv3+
|
||||
URL: http://www.kolab.org
|
||||
|
||||
Source0: http://mirror.kolabsys.com/pub/releases/libkolabxml-%{version}.tar.gz
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake >= 2.6
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: gcc-c++
|
||||
%if 0%{?rhel} > 6 || 0%{?fedora} >= 16
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdepimlibs-devel
|
||||
%endif
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: qt-devel >= 3
|
||||
# only used in tests?
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: uuid-devel
|
||||
BuildRequires: xerces-c-devel
|
||||
@ -94,6 +83,7 @@ Obsoletes: php-kolabformat < %{version}-%{release}
|
||||
|
||||
%if 0%{?with_python} < 1
|
||||
Obsoletes: python-kolabformat < %{version}-%{release}
|
||||
Obsoletes: python2-kolabformat < %{version}-%{release}
|
||||
#Provides: python-kolabformat = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
@ -107,25 +97,6 @@ Summary: Kolab XML library development headers
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-devel
|
||||
Requires: cmake >= 2.6
|
||||
Requires: e2fsprogs-devel
|
||||
Requires: gcc-c++
|
||||
%if 0%{?rhel} > 6 || 0%{?fedora} >= 16
|
||||
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
|
||||
Requires: xerces-c-devel
|
||||
Requires: xsd
|
||||
|
||||
%description devel
|
||||
Development headers for the Kolab XML libraries.
|
||||
|
||||
@ -134,7 +105,6 @@ Development headers for the Kolab XML libraries.
|
||||
Summary: C# Bindings for libkolabxml
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: mono-core
|
||||
|
||||
%description -n csharp-kolabformat
|
||||
C# bindings for libkolabxml
|
||||
%endif
|
||||
@ -143,7 +113,6 @@ C# bindings for libkolabxml
|
||||
%package -n java-kolabformat
|
||||
Summary: Java Bindings for libkolabxml
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n java-kolabformat
|
||||
Java bindings for libkolabxml
|
||||
%endif
|
||||
@ -160,39 +129,32 @@ Requires: php-api = %{php_apiver}
|
||||
%endif
|
||||
BuildRequires: php >= 5.3
|
||||
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
|
||||
%package -n python2-kolabformat
|
||||
Summary: Python bindings for libkolabxml
|
||||
Obsoletes: python-kolabformat < 1.1.4
|
||||
Provides: python-kolabformat = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: python-devel
|
||||
|
||||
%description -n python-kolabformat
|
||||
BuildRequires: python2-devel
|
||||
%description -n python2-kolabformat
|
||||
The PyKolab format package offers a comprehensive Python library using the
|
||||
bindings provided through libkolabxml.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n libkolabxml-%{version}
|
||||
|
||||
|
||||
%build
|
||||
mkdir -p build
|
||||
mkdir build
|
||||
pushd build
|
||||
%cmake \
|
||||
-Wno-fatal-errors -Wno-errors \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DCMAKE_PREFIX_PATH=%{_libdir} \
|
||||
%if 0%{?rhel} < 6 && 0%{?fedora} < 15
|
||||
-DBOOST_LIBRARYDIR=%{_libdir}/boost141 \
|
||||
-DBOOST_INCLUDEDIR=%{_includedir}/boost141 \
|
||||
-DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
|
||||
%endif
|
||||
-DINCLUDE_INSTALL_DIR=%{_includedir} \
|
||||
%cmake .. \
|
||||
%if 0%{?with_csharp} > 0
|
||||
-DCSHARP_BINDINGS=ON \
|
||||
-DCSHARP_INSTALL_DIR=%{_datadir}/%{name}/csharp/ \
|
||||
@ -207,17 +169,16 @@ pushd build
|
||||
%endif
|
||||
%if 0%{?with_python} > 0
|
||||
-DPYTHON_BINDINGS=ON \
|
||||
-DPYTHON_INCLUDE_DIRS=%{python_include} \
|
||||
-DPYTHON_INSTALL_DIR=%{python_sitearch} \
|
||||
-DPYTHON_INSTALL_DIR=%{python2_sitearch}
|
||||
%endif
|
||||
..
|
||||
make
|
||||
|
||||
popd
|
||||
|
||||
make -C build
|
||||
|
||||
|
||||
%install
|
||||
pushd build
|
||||
make install DESTDIR=%{buildroot} INSTALL='install -p'
|
||||
popd
|
||||
make install DESTDIR=%{buildroot} INSTALL='install -p' -C build
|
||||
|
||||
%if 0%{?with_php} > 0
|
||||
mkdir -p \
|
||||
@ -229,6 +190,7 @@ extension=kolabformat.so
|
||||
EOF
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
pushd build
|
||||
# Make sure libkolabxml.so.* is found, otherwise the tests fail
|
||||
@ -252,12 +214,13 @@ popd
|
||||
|
||||
%files
|
||||
%doc DEVELOPMENT NEWS README
|
||||
%{_libdir}/*.so.*
|
||||
%license COPYING*
|
||||
%{_libdir}/libkolabxml.so.1*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/kolabxml
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/cmake/Libkolabxml
|
||||
%{_includedir}/kolabxml/
|
||||
%{_libdir}/libkolabxml.so
|
||||
%{_libdir}/cmake/Libkolabxml/
|
||||
|
||||
%if 0%{?with_csharp} > 0
|
||||
%files -n csharp-kolabformat
|
||||
@ -284,7 +247,11 @@ popd
|
||||
%{python_sitearch}/_kolabformat.so
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.1.4-0.1
|
||||
- 1.1.4
|
||||
|
||||
* Wed May 18 2016 Jonathan Wakely <jwakely@redhat.com> - 1.0.3-8
|
||||
- Rebuilt for linker errors in boost (#1331983)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user