From 9c5aad89b17d3918a754d6fd5811df16170ca8aa Mon Sep 17 00:00:00 2001 From: gbcox Date: Sat, 5 Mar 2022 10:49:21 -0800 Subject: [PATCH] Upstream release: rhbz#2061087 --- .gitignore | 1 + copyq.spec | 10 ++++++---- rhbz-2053980.patch | 12 ------------ sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 rhbz-2053980.patch diff --git a/.gitignore b/.gitignore index fadc0d0..0c7bf39 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /CopyQ-b37afea33666c48948b9cd966ae9ff506151d587.tar.gz /CopyQ-91649b9cfca28c78b1b95b7a6efb2e1ecf04b02b.tar.gz /CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e.tar.gz +/CopyQ-f6684d39c5a31aa436588bdc02e950a496716b92.tar.gz diff --git a/copyq.spec b/copyq.spec index 398996b..007fc30 100644 --- a/copyq.spec +++ b/copyq.spec @@ -1,9 +1,9 @@ %global forgeurl https://github.com/hluk/CopyQ/ -%global commit f47736441b8583f2c8cce8bec872e8c6c82a5f7e +%global commit f6684d39c5a31aa436588bdc02e950a496716b92 Name: copyq -Version: 6.0.1 -Release: 3%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Summary: Advanced clipboard manager License: GPLv3+ @@ -12,7 +12,6 @@ License: GPLv3+ Url: %{forgeurl} Source0: %{forgesource} Source1: %{name}.rpmlintrc -Patch0: rhbz-2053980.patch BuildRequires: cmake, extra-cmake-modules, gcc-c++ BuildRequires: libappstream-glib BuildRequires: desktop-file-utils, git @@ -68,6 +67,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.gi %{_mandir}/man1/%{name}.1.* %changelog +* Sat Mar 05 2022 Gerald Cox - 6.1.0-1 +- Upstream release: rhbz#2061087 + * Sun Feb 13 2022 Gerald Cox - 6.0.1-3 - Wayland Titlebar Patch rhbz#2053980 diff --git a/rhbz-2053980.patch b/rhbz-2053980.patch deleted file mode 100644 index 4bf166d..0000000 --- a/rhbz-2053980.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e/src/app/clipboardserver.cpp CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e-p0/src/app/clipboardserver.cpp ---- CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e/src/app/clipboardserver.cpp 2022-01-02 01:39:43.000000000 -0800 -+++ CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e-p0/src/app/clipboardserver.cpp 2022-02-13 10:37:53.776923493 -0800 -@@ -182,6 +182,8 @@ - QString::fromLatin1("CopyQ-%1").arg(sessionName)); - } - -+ QGuiApplication::setDesktopFileName(QStringLiteral("com.github.hluk.copyq")); -+ - #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); - #endif diff --git a/sources b/sources index 9de2e83..e799b35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CopyQ-f47736441b8583f2c8cce8bec872e8c6c82a5f7e.tar.gz) = 5d76cdb577878b7567cf9ec2c63ef6785530fac4a3d93528a8dcf0a6db5de3dd41b9d5944658e22befbcf52c15f4be2cbc9501cc351baa8e0f9b9cf523deec52 +SHA512 (CopyQ-f6684d39c5a31aa436588bdc02e950a496716b92.tar.gz) = 7f1d998c36ed95d0065d38dd91d1873d6dc3d9abe3fe967a13ec1d8a4ae1e6da8dfa2cfeee42e4ff471b3491795f5f05ea3cf7777c25494453ae503959808011