Notification time stamped 2020-08-31 20:11:34 UTC
From 1ea0b161dfb339ebed9b1b4749ca7633bda18d55 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson(a)redhat.com>
Date: Aug 31 2020 20:11:14 +0000
Subject: Merge branch 'master' into epel8
---
diff --git a/.gitignore b/.gitignore
index b03eff1..e0c60b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtkeychain-0.6.2.tar.gz
/qtkeychain-0.7.0.tar.gz
/qtkeychain-0.9.1.tar.gz
+/qtkeychain-0.10.0.tar.gz
diff --git a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch
b/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch
deleted file mode 100644
index 02cb7ee..0000000
--- a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 89db0fc72d2aad5e88d7da035b27b882453a8d05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-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 <zebob.m(a)gmail.com>
----
- 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 42c73a8..f7d843d 100644
--- a/qtkeychain.spec
+++ b/qtkeychain.spec
@@ -1,21 +1,21 @@
%if 0%{?fedora}
-%global qt4 1
+%bcond_without qt4
+%else
+%bcond_with qt4
%endif
Name: qtkeychain
-Version: 0.9.1
-Release: 4%{?dist}.1
+Version: 0.10.0
+Release: 4%{?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
-%if 0%{?qt4}
+%if %{with qt4}
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
%endif
@@ -55,44 +55,39 @@ This package contains development files for qt5keychain.
%prep
%autosetup -p1
-%if 0%{?qt4}
+%if %{with qt4}
mkdir %{_target_platform}-qt4
%endif
-mkdir %{_target_platform}-qt5
%build
-%if 0%{?qt4}
-pushd %{_target_platform}-qt4
- %cmake .. \
- -DBUILD_WITH_QT4:BOOL=ON \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-popd
-%endif
-pushd %{_target_platform}-qt5
- %cmake .. \
- -DBUILD_WITH_QT4:BOOL=OFF \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-popd
+%if %{with qt4}
+%cmake -B %{_target_platform}-qt4 \
+ -DBUILD_WITH_QT4:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
-%if 0%{?qt4}
%make_build -C %{_target_platform}-qt4
%endif
-%make_build -C %{_target_platform}-qt5
+
+%cmake \
+ -DBUILD_WITH_QT4:BOOL=OFF \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+%cmake_build
%install
-%if 0%{?qt4}
+%if %{with qt4}
%make_install -C %{_target_platform}-qt4
%endif
-%make_install -C %{_target_platform}-qt5
+%cmake_install
%find_lang %{name} --with-qt
-%if 0%{?qt4}
+%if %{with qt4}
grep %{_qt4_translationdir} %{name}.lang > %{name}-qt4.lang
%endif
grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang
-%if 0%{?qt4}
+%if %{with qt4}
%files -f %{name}-qt4.lang
%doc ReadMe.txt
%license COPYING
@@ -119,6 +114,21 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang
%{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri
%changelog
+* Mon Aug 31 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.10.0-4
+- Fix for CMake macro changes
+- Add ability to disable Qt4 build (makes it easier to maintain EPEL8 branch)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-3
+- Second attempt - Rebuilt for
+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 18 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+- Drop upstreamed patches
+
* Fri May 29 2020 Troy Dawson <tdawson(a)redhat.com> - 0.9.1-4.1
- Make qt4 optional
- Only build qt4 in Fedora
diff --git a/sources b/sources
index 0995b0d..fb2ceee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtkeychain-0.9.1.tar.gz) =
c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a
+SHA512 (qtkeychain-0.10.0.tar.gz) =
de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
https://src.fedoraproject.org/rpms/qtkeychain/c/1ea0b161dfb339ebed9b1b474...