!7 fixed kf5-akonadi-search build failure in openEuler-24.03-LTS-SP1:epol
From: @chenyanpanX Reviewed-by: @misaka00251 Signed-off-by: @misaka00251
This commit is contained in:
commit
a497187df1
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Name: kf5-%{framework}
|
Name: kf5-%{framework}
|
||||||
Version: 23.08.4
|
Version: 23.08.4
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: The Akonadi Search library and indexing agent
|
Summary: The Akonadi Search library and indexing agent
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://invent.kde.org/frameworks/%{framework}
|
URL: https://invent.kde.org/frameworks/%{framework}
|
||||||
@ -27,7 +27,7 @@ BuildRequires: kf5-kcrash-devel >= 5.15
|
|||||||
BuildRequires: kf5-krunner-devel >= 5.15
|
BuildRequires: kf5-krunner-devel >= 5.15
|
||||||
BuildRequires: kf5-kcmutils-devel >= 5.15
|
BuildRequires: kf5-kcmutils-devel >= 5.15
|
||||||
%global majmin_ver %(echo %{version} | cut -d. -f1,2)
|
%global majmin_ver %(echo %{version} | cut -d. -f1,2)
|
||||||
BuildRequires: kf5-akonadi-mime-devel >= %{majmin_ver}
|
BuildRequires: kf5-akonadi-mime-devel >= %{majmin_ver}
|
||||||
BuildRequires: kf5-akonadi-server-devel >= %{majmin_ver}
|
BuildRequires: kf5-akonadi-server-devel >= %{majmin_ver}
|
||||||
BuildRequires: kf5-kcontacts-devel >= %{majmin_ver}
|
BuildRequires: kf5-kcontacts-devel >= %{majmin_ver}
|
||||||
BuildRequires: kf5-kcalendarcore-devel
|
BuildRequires: kf5-kcalendarcore-devel
|
||||||
@ -62,26 +62,18 @@ developing applications that use %{name}.
|
|||||||
%autosetup -n %{framework}-%{version} -p1
|
%autosetup -n %{framework}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir %{_target_platform}
|
%{cmake_kf5}
|
||||||
pushd %{_target_platform}
|
%{cmake_build}
|
||||||
%{cmake_kf5} .. \
|
|
||||||
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
|
|
||||||
popd
|
|
||||||
%make_build -C %{_target_platform}
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
%{cmake_install}
|
||||||
|
|
||||||
%find_lang %{name} --all-name
|
%find_lang %{name} --all-name
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?tests}
|
%{ctest}
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
|
||||||
xvfb-run -a \
|
|
||||||
dbus-launch --exit-with-session \
|
|
||||||
time \
|
|
||||||
make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
@ -108,6 +100,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
|
|||||||
%{_kf5_libdir}/libKPim5AkonadiSearchXapian.so
|
%{_kf5_libdir}/libKPim5AkonadiSearchXapian.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 15 2024 ChenYanpan <chenyanpan@xfusion.com> - 23.08.4-2
|
||||||
|
- adapt to the new CMake macros to fix build failure
|
||||||
|
|
||||||
* Mon Jan 08 2024 peijiankang <peijiankang@kylinos.cn> - 23.08.4-1
|
* Mon Jan 08 2024 peijiankang <peijiankang@kylinos.cn> - 23.08.4-1
|
||||||
- update verison to 23.08.4
|
- update verison to 23.08.4
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user