!3 update to 0.14.2
From: @Jer6y Reviewed-by: @open-bot Signed-off-by: @open-bot
This commit is contained in:
commit
8f41b8b90c
Binary file not shown.
BIN
qtkeychain-0.14.2.tar.gz
Normal file
BIN
qtkeychain-0.14.2.tar.gz
Normal file
Binary file not shown.
@ -1,38 +0,0 @@
|
|||||||
diff -rupN qtkeychain-0.13.2/CMakeLists.txt qtkeychain-0.13.2-new/CMakeLists.txt
|
|
||||||
--- qtkeychain-0.13.2/CMakeLists.txt 2021-11-18 16:34:13.000000000 +0100
|
|
||||||
+++ qtkeychain-0.13.2-new/CMakeLists.txt 2022-11-29 16:33:35.466131272 +0100
|
|
||||||
@@ -17,7 +17,6 @@ include(GNUInstallDirs)
|
|
||||||
include(GenerateExportHeader)
|
|
||||||
include(CMakePackageConfigHelpers)
|
|
||||||
include(ECMSetupVersion)
|
|
||||||
-include(ECMGeneratePriFile)
|
|
||||||
|
|
||||||
option(BUILD_WITH_QT6 "Build qtkeychain with Qt 6" OFF)
|
|
||||||
option(BUILD_TEST_APPLICATION "Build test application" OFF)
|
|
||||||
@@ -28,6 +27,10 @@ if(QTKEYCHAIN_STATIC)
|
|
||||||
message(WARNING "QTKEYCHAIN_STATIC is deprecated. Use BUILD_SHARED_LIBS=OFF instead.")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
+if(NOT BUILD_WITH_QT6)
|
|
||||||
+ include(ECMGeneratePriFile)
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL Android)
|
|
||||||
set(ANDROID 1)
|
|
||||||
endif()
|
|
||||||
@@ -286,6 +289,7 @@ ecm_setup_version("${QTKEYCHAIN_VERSION}
|
|
||||||
if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
|
|
||||||
set(PRI_EXTRA_DEPS "dbus")
|
|
||||||
endif()
|
|
||||||
+if (NOT BUILD_WITH_QT6)
|
|
||||||
ecm_generate_pri_file(BASE_NAME Qt${QTKEYCHAIN_VERSION_INFIX}Keychain
|
|
||||||
LIB_NAME ${QTKEYCHAIN_TARGET_NAME}
|
|
||||||
DEPS "core ${PRI_EXTRA_DEPS}"
|
|
||||||
@@ -293,6 +297,7 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKE
|
|
||||||
FILENAME_VAR pri_filename)
|
|
||||||
|
|
||||||
install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
|
|
||||||
+endif ()
|
|
||||||
|
|
||||||
|
|
||||||
install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends
|
|
||||||
@ -2,15 +2,13 @@
|
|||||||
%bcond_without qt6
|
%bcond_without qt6
|
||||||
|
|
||||||
Name: qtkeychain
|
Name: qtkeychain
|
||||||
Version: 0.13.2
|
Version: 0.14.2
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: A password store library
|
Summary: A password store library
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
Url: https://github.com/frankosterfeld/qtkeychain
|
Url: https://github.com/frankosterfeld/qtkeychain
|
||||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
# Fix qt6 detection broken by including ECMGeneratePriFile
|
|
||||||
Patch0: qtkeychain-qt6.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -131,14 +129,17 @@ grep %{_datadir}/qt6keychain/translations %{name}.lang > %{name}-qt6.lang
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%{_libdir}/libqt6keychain.so.1
|
%{_libdir}/libqt6keychain.so.1
|
||||||
%{_libdir}/libqt6keychain.so.0*
|
%{_libdir}/libqt6keychain.so.0*
|
||||||
|
|
||||||
%files qt6-devel
|
%files qt6-devel
|
||||||
%{_includedir}/qt6keychain/
|
%{_includedir}/qt6keychain/
|
||||||
%{_libdir}/cmake/Qt6Keychain/
|
%{_libdir}/cmake/Qt6Keychain/
|
||||||
%{_libdir}/libqt6keychain.so
|
%{_libdir}/libqt6keychain.so
|
||||||
|
%{_libdir}/qt6/mkspecs/modules/qt_Qt6Keychain.pri
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 09 2024 luojun <luojun.oerv@isrc.iscas.ac.cn> - 0.14.2-1
|
||||||
|
- Update to 0.14.2
|
||||||
|
|
||||||
* Thu Sep 07 2023 peijiankang <peijiankang@kylinos.cn> - 0.13.2-1
|
* Thu Sep 07 2023 peijiankang <peijiankang@kylinos.cn> - 0.13.2-1
|
||||||
- 0.13.2
|
- 0.13.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user