diff --git a/.gitignore b/.gitignore index b7458b4..b03eff1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtkeychain-0.5.0.tar.gz /qtkeychain-0.6.2.tar.gz /qtkeychain-0.7.0.tar.gz +/qtkeychain-0.9.1.tar.gz diff --git a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch b/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch new file mode 100644 index 0000000..02cb7ee --- /dev/null +++ b/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch @@ -0,0 +1,30 @@ +From 89db0fc72d2aad5e88d7da035b27b882453a8d05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Sun, 28 Apr 2019 21:46:14 +0200 +Subject: [PATCH] Convert QStringLiteral to QLatin1String to keep compatibility + with Qt4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Robert-André Mauchin +--- + keychain_unix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/keychain_unix.cpp b/keychain_unix.cpp +index 958927a..b9a8e9d 100644 +--- a/keychain_unix.cpp ++++ b/keychain_unix.cpp +@@ -93,7 +93,7 @@ static bool isKwallet5Available() + // a wallet can be opened. + + iface.setTimeout(500); +- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); ++ QDBusMessage reply = iface.call(QLatin1String("networkWallet")); + return reply.type() == QDBusMessage::ReplyMessage; + } + +-- +2.21.0 + diff --git a/qtkeychain.spec b/qtkeychain.spec index 2bb0ba1..8e0f6f3 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,22 +1,22 @@ -%global _hardened_build 1 - Name: qtkeychain -Version: 0.7.0 -Release: 8%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: A password store library License: BSD Url: https://github.com/frankosterfeld/qtkeychain Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/frankosterfeld/qtkeychain/pull/144 +Patch0: 0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch BuildRequires: gcc-c++ BuildRequires: cmake - BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtDBus) +BuildRequires: pkgconfig(libsecret-1) %description -The qtkeychain library allows you to store passwords easy and secure. +The qtkeychain library allows you to store passwords easily and securely. %package devel Summary: Development files for %{name} @@ -29,7 +29,7 @@ This package contains development files for qtkeychain. Summary: %{summary} %description qt5 -The qt5keychain library allows you to store passwords easy and secure. +The qt5keychain library allows you to store passwords easily and securely. %package qt5-devel Summary: Development files for %{name}-qt5 @@ -42,7 +42,7 @@ Requires: qt5-qtbase-devel%{?_isa} This package contains development files for qt5keychain. %prep -%autosetup +%autosetup -p1 mkdir %{_target_platform}-qt4 mkdir %{_target_platform}-qt5 @@ -70,32 +70,34 @@ popd grep %{_qt4_translationdir} %{name}.lang > %{name}-qt4.lang grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang - -%ldconfig_scriptlets - %files -f %{name}-qt4.lang %doc ReadMe.txt %license COPYING -%{_libdir}/libqtkeychain.so.* +%{_libdir}/libqtkeychain.so.1 +%{_libdir}/libqtkeychain.so.0* %files devel %{_includedir}/qtkeychain/ %{_libdir}/cmake/QtKeychain/ %{_libdir}/libqtkeychain.so - -%ldconfig_scriptlets qt5 +%{_libdir}/qt5/mkspecs/modules/qt_QtKeychain.pri %files qt5 -f %{name}-qt5.lang %doc ReadMe.txt %license COPYING -%{_libdir}/libqt5keychain.so.* +%{_libdir}/libqt5keychain.so.1 +%{_libdir}/libqt5keychain.so.0* %files qt5-devel %{_includedir}/qt5keychain/ %{_libdir}/cmake/Qt5Keychain/ %{_libdir}/libqt5keychain.so +%{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Sun Apr 28 2019 Robert-André Mauchin - 0.9.1-1 +- Release 0.9.1 (#1601122, #1481589) + * Sat Feb 02 2019 Fedora Release Engineering - 0.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -163,8 +165,8 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang * Sat Jan 04 2014 0.1.0-3.20130805git - Fix Version and Release -- Fix %%files devel's cmake ownership by pointing the subfiles -- Fix Changelog to reflect version and release changes +- Fix %%files devel's cmake ownership by pointing the subfiles +- Fix Changelog to reflect version and release changes * Tue Dec 24 2013 0.1.0-2.20130805git - Fix descriptions diff --git a/sources b/sources index 50aca35..0995b0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3361893bc8fd176cd35116796df40028 qtkeychain-0.7.0.tar.gz +SHA512 (qtkeychain-0.9.1.tar.gz) = c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a