sync master to openEuler-22.03-LTS-Next
This commit is contained in:
parent
1fef4450ad
commit
81b90a07e3
@ -1,11 +1,8 @@
|
|||||||
%undefine __cmake_in_source_build
|
%undefine __cmake_in_source_build
|
||||||
%global framework kwayland
|
%global framework kwayland
|
||||||
|
|
||||||
%global wayland_min_version 1.3
|
%global wayland_min_version 1.3
|
||||||
|
|
||||||
## uncomment to enable bootstrap mode
|
## uncomment to enable bootstrap mode
|
||||||
#global bootstrap 1
|
#global bootstrap 1
|
||||||
|
|
||||||
## currently includes no tests
|
## currently includes no tests
|
||||||
%if !0%{?bootstrap}
|
%if !0%{?bootstrap}
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
@ -14,11 +11,10 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: kf5-%{framework}
|
Name: kf5-%{framework}
|
||||||
Version: 5.95.0
|
Version: 5.100.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries
|
Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries
|
||||||
|
License: GPL-2.0-or-later
|
||||||
License: GPLv2+
|
|
||||||
URL: https://invent.kde.org/frameworks/%{framework}
|
URL: https://invent.kde.org/frameworks/%{framework}
|
||||||
|
|
||||||
%global majmin %(echo %{version} | cut -d. -f1-2)
|
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||||
@ -34,15 +30,16 @@ BuildRequires: make
|
|||||||
BuildRequires: extra-cmake-modules >= %{version}
|
BuildRequires: extra-cmake-modules >= %{version}
|
||||||
BuildRequires: kf5-rpm-macros >= %{version}
|
BuildRequires: kf5-rpm-macros >= %{version}
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
|
BuildRequires: qt5-qtbase-static
|
||||||
# https://bugs.kde.org/show_bug.cgi?id=365569#c8 claims this is needed
|
# https://bugs.kde.org/show_bug.cgi?id=365569#c8 claims this is needed
|
||||||
BuildRequires: qt5-qtbase-private-devel
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||||
BuildRequires: wayland-devel >= %{wayland_min_version}
|
BuildRequires: wayland-devel >= %{wayland_min_version}
|
||||||
BuildRequires: wayland-protocols-devel
|
BuildRequires: wayland-protocols-devel
|
||||||
BuildRequires: qt5-qttools-devel
|
BuildRequires: qt5-qttools-devel
|
||||||
|
|
||||||
BuildRequires: qt5-qtwayland-devel
|
BuildRequires: qt5-qtwayland-devel
|
||||||
BuildRequires: cmake(PlasmaWaylandProtocols) > 1.1
|
BuildRequires: cmake(PlasmaWaylandProtocols) > 1.1
|
||||||
|
BuildRequires: libxkbcommon
|
||||||
|
|
||||||
%if 0%{?tests}
|
%if 0%{?tests}
|
||||||
BuildRequires: dbus-x11
|
BuildRequires: dbus-x11
|
||||||
@ -51,7 +48,6 @@ BuildRequires: weston
|
|||||||
BuildRequires: xorg-x11-server-Xvfb
|
BuildRequires: xorg-x11-server-Xvfb
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
Requires: kf5-filesystem >= %{version}
|
Requires: kf5-filesystem >= %{version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -61,16 +57,13 @@ Requires: kf5-filesystem >= %{version}
|
|||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: qt5-qtbase-devel
|
Requires: qt5-qtbase-devel
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The %{name}-devel package contains libraries and header files for
|
The %{name}-devel package contains libraries and header files for
|
||||||
developing applications that use %{name}.
|
developing applications that use %{name}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{framework}-%{version} -p1
|
%autosetup -n %{framework}-%{version} -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir %{_target_platform}
|
mkdir %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
@ -80,11 +73,9 @@ popd
|
|||||||
|
|
||||||
%make_build -C %{_target_platform}
|
%make_build -C %{_target_platform}
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?tests}
|
%if 0%{?tests}
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
export CTEST_OUTPUT_ON_FAILURE=1
|
||||||
@ -94,7 +85,6 @@ time \
|
|||||||
make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
|
make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -114,16 +104,24 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
|
|||||||
%{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandClient.pri
|
%{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandClient.pri
|
||||||
%{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri
|
%{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 5 2022 huayadong<huayadong@kylinos.cn> - 5.95.0-1
|
* Mon Dec 12 2022 wangjunqi <wangjunqi@kylinos.cn> - 5.100.0-1
|
||||||
|
- update to upstream version 5.100.0
|
||||||
|
|
||||||
|
* Mon Sep 05 2022 liweiganga <liweiganga@uniontech.com> - 5.97.0-1
|
||||||
|
- update to upstream version 5.97.0
|
||||||
|
|
||||||
|
* Tue Jul 05 2022 huayadong <huayadong@kylinos.cn> - 5.95.0-1
|
||||||
- update to upstream version 5.95.0
|
- update to upstream version 5.95.0
|
||||||
|
|
||||||
* Sat Feb 12 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.90.0-1
|
* Sat Feb 12 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.90.0-1
|
||||||
- update to upstream version 5.90.0
|
- update to upstream version 5.90.0
|
||||||
|
|
||||||
* Fri Jan 14 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.88.0-1
|
* Fri Jan 14 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.88.0-1
|
||||||
- update to upstream version 5.88.0
|
- update to upstream version 5.88.0
|
||||||
|
|
||||||
* Thu Jul 23 2020 wangmian<wangmian@kylinos.cn> - 5.55.0-1
|
* Mon Dec 13 2021 douyan <douyan@kylinos.cn> - 5.55.0-2
|
||||||
|
- remove %{?dist}
|
||||||
|
|
||||||
|
* Thu Jul 23 2020 wangmian <wangmian@kylinos.cn> - 5.55.0-1
|
||||||
- Init kf5-kwayland project
|
- Init kf5-kwayland project
|
||||||
|
|||||||
4
kf5-kwayland.yaml
Normal file
4
kf5-kwayland.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: git
|
||||||
|
src_repo: https://invent.kde.org/frameworks/kwayland.git
|
||||||
|
tag_prefix: "^v"
|
||||||
|
separator: "."
|
||||||
BIN
kwayland-5.100.0.tar.xz
Normal file
BIN
kwayland-5.100.0.tar.xz
Normal file
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user