!3 update to upstream version 5.88.0

Merge pull request !3 from pei-jiankang/master

0001-fix-rpmbuild-failed.patch

@@ -1,37 +0,0 @@
-From dc112dc87491115ec1245971f0c9c3b0a8719b6a Mon Sep 17 00:00:00 2001
-From: yeqinglong <yeqinglong@uniontech.com>
-Date: Tue, 18 Aug 2020 18:26:22 +0800
-Subject: [PATCH] fix rpmbuild failed
-
----
- src/cmake/libKF5Attica.pc.cmake | 2 +-
- src/cmake/libattica.pc.cmake    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cmake/libKF5Attica.pc.cmake b/src/cmake/libKF5Attica.pc.cmake
-index 75387fa..4a60223 100644
---- a/src/cmake/libKF5Attica.pc.cmake
-+++ b/src/cmake/libKF5Attica.pc.cmake
-@@ -6,6 +6,6 @@ includedir=${INCLUDE_INSTALL_DIR}/KF5Attica
- Name: lib${ATTICA_LIB_SONAME}
- Description: Qt library to access Open Collaboration Services
- #Requires:
--Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}
-+Version: 5.55.0
- Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME}
- Cflags: -I${INCLUDE_INSTALL_DIR}/KF5Attica
-diff --git a/src/cmake/libattica.pc.cmake b/src/cmake/libattica.pc.cmake
-index 9b73985..3c87a3b 100644
---- a/src/cmake/libattica.pc.cmake
-+++ b/src/cmake/libattica.pc.cmake
-@@ -6,6 +6,6 @@ includedir=${INCLUDE_INSTALL_DIR}
- Name: lib${ATTICA_LIB_SONAME}
- Description: Qt library to access Open Collaboration Services
- #Requires:
--Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}
-+Version: 5.55.0
- Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME}
- Cflags: -I${INCLUDE_INSTALL_DIR}
--- 
-2.18.4
-

kf5-attica.spec

@@ -1,12 +1,18 @@
+%undefine __cmake_in_source_build
 %global framework attica
+%{!?docs: %global docs 1}
+
+%if 0%{?flatpak}
+%global docs 0
+%endif
 
 Name:           kf5-attica
-Version: 5.55.0
-Release: 1
+Version:        5.88.0
+Release:        1
 Summary:        KDE Frameworks Tier 1 Addon with Open Collaboration Services API
 
 License:        LGPLv2+
-URL:            https://cgit.kde.org/%{framework}.git
+URL:            https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -16,7 +22,6 @@ URL:            https://cgit.kde.org/%{framework}.git
 %global stable stable
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
-Patch0:		0001-fix-rpmbuild-failed.patch
 
 BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  kf5-rpm-macros >= %{version}
@@ -35,18 +40,36 @@ Requires:       qt5-qtbase-devel
 %description    devel
 %{summary}.
 
+%if 0%{?docs}
+%package doc
+Summary:        API documentation for %{name}
+BuildRequires:  doxygen
+BuildRequires:  qt5-qdoc
+BuildRequires:  qt5-qhelpgenerator
+BuildRequires:  qt5-qtbase-doc
+Requires:       kf5-filesystem
+BuildArch:      noarch
+%description doc
+%{summary}.
+%endif
 
 %prep
-%autosetup -n %{framework}-%{version} -p1 
-
-
+%autosetup -n %{framework}-%{version}
 
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} .. \
+  %if 0%{?flatpak}
+  %{?docs:-DBUILD_QCH:BOOL=OFF} \
+  %else
+  %{?docs:-DBUILD_QCH:BOOL=ON} \
+  %endif
+
 popd
+ 
+
 
 %make_build -C %{_target_platform}
 
@@ -59,8 +82,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %files
 %doc AUTHORS ChangeLog README.md
-%license COPYING
-%{_kf5_sysconfdir}/xdg/%{framework}.*
+%license LICENSES/*.txt
+%{_kf5_datadir}/qlogging-categories5/%{framework}.*
 %{_kf5_libdir}/libKF5Attica.so.*
 
 %files devel
@@ -71,7 +94,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_archdatadir}/mkspecs/modules/qt_Attica.pri
 %{_kf5_libdir}/pkgconfig/libKF5Attica.pc
 
+%if 0%{?docs}
+%{_qt5_docdir}/KF5Attica.qch
+%{_qt5_docdir}/KF5Attica.tags
+%endif
+
 
 %changelog
+* Sun Jan 16 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1
+- update to upstream version 5.88.0
+
 * Mon Aug 17 2020 yeqinglong <yeqinglong@uniontech.com> - 5.55.0-1
 - Initial release for OpenEuler

kf5-attica.yaml

@@ -1,4 +1,4 @@
 version_control: github
 src_repo: KDE/attica
 tag_prefix: "^v"
-seperator: "."
+separator: "."