Adjusted for new cmake macros (out of source builds)
This commit is contained in:
parent
a652f2a833
commit
ff6c7e4f42
@ -51,7 +51,7 @@
|
||||
|
||||
Name: libkolabxml
|
||||
Version: 1.1.6
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
Summary: Kolab XML format collection parser library
|
||||
|
||||
License: LGPLv3+
|
||||
@ -169,8 +169,6 @@ sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
|
||||
|
||||
|
||||
%build
|
||||
mkdir build
|
||||
pushd build
|
||||
%cmake .. \
|
||||
%if 0%{?with_csharp} > 0
|
||||
-DCSHARP_BINDINGS=ON \
|
||||
@ -189,12 +187,10 @@ pushd build
|
||||
-DPYTHON_INSTALL_DIR=%{python3_sitearch}
|
||||
%endif
|
||||
|
||||
popd
|
||||
|
||||
make -C build
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} INSTALL='install -p' -C build
|
||||
%cmake_install
|
||||
|
||||
%if 0%{?with_php} > 0
|
||||
mkdir -p \
|
||||
@ -208,7 +204,7 @@ EOF
|
||||
|
||||
|
||||
%check
|
||||
pushd build
|
||||
pushd %{_vpath_builddir}
|
||||
# Make sure libkolabxml.so.* is found, otherwise the tests fail
|
||||
export LD_LIBRARY_PATH=$( pwd )/src/
|
||||
pushd tests
|
||||
@ -265,6 +261,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 10 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.1.6-19
|
||||
- Adjusted for new cmake macros (out of source builds)
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-18
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user