Merge branch 'updates' into 'master'

Slew of applicaton updates

See merge request bgstack15/stackrpms!99

3 files changed, 91 insertions, 24 deletions

diff --git a/copyq/README.md b/copyq/README.md
new file mode 100644
index 0000000..389f4dc
--- /dev/null
+++ b/copyq/README.md
@@ -0,0 +1,15 @@
+# CopyQ upstream
+https://github.com/hluk/CopyQ
+https://src.fedoraproject.org/rpms/copyq/blob/f30/f/copyq.spec
+
+# Reason for being in stackrpms
+CentOS does not package CopyQ, which is my preferred clipboard manager for desktop environments.
+
+# Reverse dependency matrix
+Distro     | copyq version
+---------- | ---------------
+CentOS 7   | 3.9.2
+CentOS 8   | 3.9.2
+
+# Differences from upstream
+See file [stackrpms-copyq.spec.diff](stackrpms-copyq.spec.diff)
diff --git a/copyq/copyq.spec b/copyq/copyq.spec
index 59c3b9f..c06f6e8 100644
--- a/copyq/copyq.spec
+++ b/copyq/copyq.spec
@@ -1,20 +1,19 @@
-# copyq spec for CentOS 7 and 8. Ripped from Fedora release. No attempt to fedoraize is made here.
 %define with_html 1
-%global project		CopyQ
-Name:		copyq	
-Summary:	Advanced clipboard manager
-Version:	3.9.2
-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
-BuildRequires:	libXtst-devel, libXfixes-devel, desktop-file-utils
-BuildRequires:	kf5-rpm-macros, qt5-qtbase-devel, qt5-qtsvg-devel
-BuildRequires:	qt5-qttools-devel, qt5-qtscript-devel, qt5-qtx11extras-devel
-BuildRequires:	extra-cmake-modules
+%global project      CopyQ
+Name:    copyq 
+Summary: Advanced clipboard manager
+Version: 3.9.2
+Release: 2%{?dist}
+License: GPLv3+
+Url:     https://hluk.github.io/%{project}/
+Source0: https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz
+BuildRequires: libXtst-devel, libXfixes-devel, desktop-file-utils
+BuildRequires: kf5-rpm-macros, qt5-qtbase-devel, qt5-qtsvg-devel
+BuildRequires: qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel, qt5-qtx11extras-devel
+BuildRequires: extra-cmake-modules, appstream-qt-devel
 %if 0%{?rhel} >= 8
 %else
-BuildRequires:	qwt-devel
+BuildRequires: qwt-devel
 %endif
 %if 0%{?with_html}
 BuildRequires: qt5-qtwebkit-devel
@@ -30,12 +29,12 @@ chmod 644 %{SOURCE0}
 sed -i '/DQT_RESTRICTED_CAST_FROM_ASCII/d' CMakeLists.txt
 
 %build
-%{cmake_kf5}	-DCMAKE_SKIP_RPATH=TRUE \
-				-DWITH_QT5=ON \
-				-DWITH_TESTS=TRUE \
-				-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-				-DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \
-				-DTRANSLATION_INSTALL_PREFIX:PATH=%{_datadir}/%{name}/locale .
+%{cmake_kf5}   -DCMAKE_SKIP_RPATH=TRUE \
+            -DWITH_QT5=ON \
+            -DWITH_TESTS=TRUE \
+            -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+            -DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \
+            -DTRANSLATION_INSTALL_PREFIX:PATH=%{_datadir}/%{name}/locale .
 make %{?_smp_mflags}
 
 %install
@@ -60,11 +59,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.github.hluk.%{
 %{_mandir}/man1/%{name}.1.*
 
 %changelog
-* Tue Oct 08 2019 B Stack <bgstack15@gmail.com> - 3.9.2-1
-- Upstream release
+* Tue Nov 12 2019 B Stack <bgstack15@gmail.com> - 3.9.2-2
+- Adapted for CentOS 7 and 8
 
-* Wed Jul 31 2019 B Stack <bgstack15@gmail.com> - 3.9.0-1
-- Adapted for CentOS 7
+* Sun Aug 25 2019 Gerald Cox <gbcox@fedoraproject.org> - 3.9.2-1
+- Upstream release rhbz#1742997
+
+* Sun Aug 18 2019 Gerald Cox <gbcox@fedoraproject.org> - 3.9.1-1
+- Upstream release rhbz#1742997
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Thu Jun 27 2019 Gerald Cox <gbcox@fedoraproject.org> - 3.9.0-1
 - Upstream release rhbz#1724540
diff --git a/copyq/stackrpms-copyq.spec.diff b/copyq/stackrpms-copyq.spec.diff
new file mode 100644
index 0000000..4af7cf1
--- /dev/null
+++ b/copyq/stackrpms-copyq.spec.diff
@@ -0,0 +1,47 @@
+--- fedora/copyq.spec	2019-11-12 11:36:41.794801633 -0500
++++ stackrpms/copyq.spec	2019-11-12 11:52:29.115005959 -0500
+@@ -1,15 +1,23 @@
++%define with_html 1
+ %global project      CopyQ
+ Name:    copyq 
+ Summary: Advanced clipboard manager
+ Version: 3.9.2
+-Release: 1%{?dist}
++Release: 2%{?dist}
+ License: GPLv3+
+ Url:     https://hluk.github.io/%{project}/
+ Source0: https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz
+ BuildRequires: libXtst-devel, libXfixes-devel, desktop-file-utils
+-BuildRequires: kf5-rpm-macros, qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel
++BuildRequires: kf5-rpm-macros, qt5-qtbase-devel, qt5-qtsvg-devel
+ BuildRequires: qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel, qt5-qtx11extras-devel
+-BuildRequires: extra-cmake-modules, appstream-qt-devel, libappstream-glib
++BuildRequires: extra-cmake-modules, appstream-qt-devel
++%if 0%{?rhel} >= 8
++%else
++BuildRequires: qwt-devel
++%endif
++%if 0%{?with_html}
++BuildRequires: qt5-qtwebkit-devel
++%endif
+ 
+ %description
+ CopyQ is advanced clipboard manager with searchable and editable history with
+@@ -35,7 +43,6 @@
+ 
+ %check
+ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.github.hluk.%{name}.desktop
+-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.github.hluk.%{name}.appdata.xml
+ 
+ %files -f %{name}.lang
+ %doc AUTHORS CHANGES HACKING README.md
+@@ -52,6 +59,9 @@
+ %{_mandir}/man1/%{name}.1.*
+ 
+ %changelog
++* Tue Nov 12 2019 B Stack <bgstack15@gmail.com> - 3.9.2-2
++- Adapted for CentOS 7 and 8
++
+ * Sun Aug 25 2019 Gerald Cox <gbcox@fedoraproject.org> - 3.9.2-1
+ - Upstream release rhbz#1742997
+