From 2fe4f4d1f3ae0931c62b8b743dce0814b34cc771 Mon Sep 17 00:00:00 2001 From: ebasov Date: Wed, 15 Jan 2025 15:36:13 +0300 Subject: [PATCH] Rebuild For MSVSphere 10 --- .gitignore | 2 +- .qtkeychain.metadata | 2 +- SPECS/qtkeychain.spec | 126 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 117 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7cef22b..9246bdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtkeychain-0.13.2.tar.gz +SOURCES/qtkeychain-0.14.3.tar.gz diff --git a/.qtkeychain.metadata b/.qtkeychain.metadata index 8a9604d..7d2d672 100644 --- a/.qtkeychain.metadata +++ b/.qtkeychain.metadata @@ -1 +1 @@ -9716bacd36df99af04dbe59434e29f35411e86a2 SOURCES/qtkeychain-0.13.2.tar.gz +d92ad4b28be5b0f0452699e45777d576ce95e3c0 SOURCES/qtkeychain-0.14.3.tar.gz diff --git a/SPECS/qtkeychain.spec b/SPECS/qtkeychain.spec index 6754dd9..76170fa 100644 --- a/SPECS/qtkeychain.spec +++ b/SPECS/qtkeychain.spec @@ -1,12 +1,24 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.7.2) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%bcond_without qt5 +%bcond_without qt6 Name: qtkeychain -Version: 0.13.2 -Release: 1%{?dist} +Version: 0.14.3 +Release: %autorelease Summary: A password store library -License: BSD +License: BSD-3-Clause Url: https://github.com/frankosterfeld/qtkeychain -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: make BuildRequires: gcc-c++ @@ -16,12 +28,15 @@ BuildRequires: pkgconfig(libsecret-1) %description The qtkeychain library allows you to store passwords easily and securely. + +%if %{with qt5} %package qt5 Summary: %{summary} %description qt5 The qt5keychain library allows you to store passwords easily and securely. + %package qt5-devel Summary: Development files for %{name}-qt5 BuildRequires: cmake(Qt5Core) @@ -34,25 +49,73 @@ Requires: pkgconfig(libsecret-1) %description qt5-devel This package contains development files for qt5keychain. +%endif + + +%if %{with qt6} +%package qt6 +Summary: %{summary} + +%description qt6 +The qt6keychain library allows you to store passwords easily and securely. + + +%package qt6-devel +Summary: Development files for %{name}-qt6 +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6LinguistTools) +Requires: %{name}-qt6%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +# deps referenced in Qt6KeychainLibraryDepends-relwithdebinfo.cmake: IMPORTED_LINK_INTERFACE_LIBRARIES_RELWITHDEBINFO "Qt6::Core;secret-1;gio-2.0;gobject-2.0;glib-2.0;Qt6::DBus" +# *probably* overlinking and can be pruned, but requires closer inspection +Requires: pkgconfig(libsecret-1) + +%description qt6-devel +This package contains development files for qt6keychain. +%endif + %prep %autosetup -p1 %build +%if %{with qt5} +%define _vpath_builddir %{_target_platform}-qt5 %cmake \ - -DBUILD_WITH_QT4:BOOL=OFF \ + -DBUILD_WITH_QT6:BOOL=OFF \ + -DECM_MKSPECS_INSTALL_DIR=%{_qt5_archdatadir}/mkspecs/modules \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +%cmake_build +%endif +%if %{with qt6} +%define _vpath_builddir %{_target_platform}-qt6 +%cmake \ + -DBUILD_WITH_QT6:BOOL=ON \ + -DECM_MKSPECS_INSTALL_DIR=%{_qt6_archdatadir}/mkspecs/modules \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_build +%endif + %install +%if %{with qt5} +%define _vpath_builddir %{_target_platform}-qt5 %cmake_install +%endif -%find_lang %{name} --with-qt +%if %{with qt6} +%define _vpath_builddir %{_target_platform}-qt6 +%cmake_install +%endif +%find_lang %{name} --with-qt grep %{_datadir}/qt5keychain/translations %{name}.lang > %{name}-qt5.lang +grep %{_datadir}/qt6keychain/translations %{name}.lang > %{name}-qt6.lang + +%if %{with qt5} %files qt5 -f %{name}-qt5.lang %license COPYING %{_libdir}/libqt5keychain.so.1 @@ -62,14 +125,53 @@ grep %{_datadir}/qt5keychain/translations %{name}.lang > %{name}-qt5.lang %{_includedir}/qt5keychain/ %{_libdir}/cmake/Qt5Keychain/ %{_libdir}/libqt5keychain.so -%{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_Qt5Keychain.pri +%endif + +%if %{with qt6} +%files qt6 -f %{name}-qt6.lang +%license COPYING +%{_libdir}/libqt6keychain.so.1 +%{_libdir}/libqt6keychain.so.0* + +%files qt6-devel +%{_includedir}/qt6keychain/ +%{_libdir}/cmake/Qt6Keychain/ +%{_libdir}/libqt6keychain.so +%{_qt6_archdatadir}/mkspecs/modules/qt_Qt6Keychain.pri +%endif %changelog -* Mon Sep 02 2024 Eduard Basov - 0.13.2-1 -- Rebuilt for MSVSphere 9.4 +## START: Generated by rpmautospec +* Wed Jan 15 2025 Eduard Basov - 0.14.3-2 +- Rebuild For MSVSphere 10 + +* Sun Jun 02 2024 Yaakov Selkowitz - 0.14.3-2 +- Fix flatpak build -* Sat Aug 20 2022 Mukundan Ragavan - 0.13.2-1 -- Update to 0.13.2 +* Thu May 30 2024 Neal Gompa - 0.14.3-1 +- Update to 0.14.3 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.14.1^20231214.040100.22bac41-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.14.1^20231214.040100.22bac41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 15 2023 Steve Cossette - 0.14.1^20231214.040100.22bac41-1 +- Built from git + +* Fri Jul 21 2023 Fedora Release Engineering - 0.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 0.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 13 2022 Troy Dawson - 0.13.2-2 +- Clean up qt4 build dependencies + +* Wed Nov 30 2022 Sandro Mani - 0.13.2-3 +- Add qt6 build * Sat Jul 23 2022 Fedora Release Engineering - 0.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -188,3 +290,5 @@ grep %{_datadir}/qt5keychain/translations %{name}.lang > %{name}-qt5.lang * Mon Dec 23 2013 0.1.0-1.20130805git - Initial Packaging + +## END: Generated by rpmautospec