From 2072bf5faa97a95787c875ec5a021157fdfc8efd Mon Sep 17 00:00:00 2001 From: Gerald B Cox Date: Apr 10 2019 17:26:13 +0000 Subject: Upstream release rhbz#1698544 --- diff --git a/.gitignore b/.gitignore index bbac6a0..f7cfc5b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /CopyQ-3.7.2.tar.gz /CopyQ-3.7.3.tar.gz /copyq_1078_adda483.patch +/CopyQ-3.8.0.tar.gz diff --git a/copyq.spec b/copyq.spec index 3d3287d..e723310 100644 --- a/copyq.spec +++ b/copyq.spec @@ -1,12 +1,11 @@ %global project CopyQ Name: copyq Summary: Advanced clipboard manager -Version: 3.7.3 -Release: 2%{?dist} +Version: 3.8.0 +Release: 1%{?dist} License: GPLv3+ Url: https://hluk.github.io/%{project}/ Source0: https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz -Patch0: copyq_1078_adda483.patch BuildRequires: libXtst-devel, libXfixes-devel, desktop-file-utils BuildRequires: kf5-rpm-macros, qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel BuildRequires: qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel, qt5-qtx11extras-devel @@ -20,7 +19,6 @@ support for image formats, command line control and more. chmod 644 %{SOURCE0} %setup -qn %{project}-%{version} sed -i '/DQT_RESTRICTED_CAST_FROM_ASCII/d' CMakeLists.txt -%patch0 -p1 %build %{cmake_kf5} -DCMAKE_SKIP_RPATH=TRUE \ @@ -54,6 +52,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.gi %{_mandir}/man1/%{name}.1.* %changelog +* Wed Apr 10 2019 Gerald Cox - 3.8.0-1 +- Upstream release rhbz#1698544 + * Mon Feb 04 2019 Gerald Cox - 3.7.3-2 - Patch for missing tray icon rhbz#1672064 diff --git a/copyq_1078_adda483.patch b/copyq_1078_adda483.patch deleted file mode 100644 index 351de09..0000000 --- a/copyq_1078_adda483.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/gui/iconfactory.cpp b/src/gui/iconfactory.cpp -index bdad5919..1580d3ed 100644 ---- a/src/gui/iconfactory.cpp -+++ b/src/gui/iconfactory.cpp -@@ -362,11 +362,14 @@ public: - return taggedIcon(&pixmap); - } - -- QList availableSizes(QIcon::Mode mode, QIcon::State state) const override -+ QList availableSizes(QIcon::Mode, QIcon::State) const override - { -- auto sizes = QIconEngine::availableSizes(mode, state); -- if ( !sizes.isEmpty() ) -- sizes.append( sizes.last() * 2 ); -+ static const auto sizes = QList() -+ << QSize(32, 32) -+ << QSize(48, 48) -+ << QSize(64, 64) -+ << QSize(96, 96) -+ << QSize(128, 128); - return sizes; - } - diff --git a/sources b/sources index a29d058..204bb98 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (CopyQ-3.7.3.tar.gz) = 932b52e28b823416b720db51af47286d72f5196ce20dc8e11fdefaf6c92518f7a15d6eb2b613b9ef71d21bef80dd3bcb9f1594eae922f8b57de64c168cd2eeca -SHA512 (copyq_1078_adda483.patch) = 7af09f4f4704233c91bdbb77ea80fc0e06f6b8efbff131330171c9dadd523d1594408c88cc2da2583ccd32fbb8c83bfe835af0638e7b939f3380dac974e6729c +SHA512 (CopyQ-3.8.0.tar.gz) = ae22e5e00a2624b5fb551790ccda82f4a10a026cfd16d6526b370a0a210a939f2a11d0729f2b735e201085083514ff9eff8cda69ee2d360766fbfb7ea49b6c5e