Hello community,

here is the log from the commit of package cutecom for openSUSE:Factory checked 
in at 2020-06-05 20:20:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cutecom (Old)
 and      /work/SRC/openSUSE:Factory/.cutecom.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cutecom"

Fri Jun  5 20:20:56 2020 rev:17 rq:811666 version:0.51.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/cutecom/cutecom.changes  2018-09-04 
22:57:42.873317235 +0200
+++ /work/SRC/openSUSE:Factory/.cutecom.new.3606/cutecom.changes        
2020-06-05 20:27:25.173021329 +0200
@@ -1,0 +2,14 @@
+Fri Jun  5 06:48:59 UTC 2020 - Martin Pluskal <[email protected]>
+
+- Small packaging adjustements:
+  * Dont manually compress manpages
+  * Fully leverage install command
+
+-------------------------------------------------------------------
+Thu Jun  4 16:51:08 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Add patch to fix build with Qt 5.15:
+  * 0001-Fix-build-with-Qt-5.15.patch
+- Spec cleanup
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-build-with-Qt-5.15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cutecom.spec ++++++
--- /var/tmp/diff_new_pack.eMd39b/_old  2020-06-05 20:27:26.877026650 +0200
+++ /var/tmp/diff_new_pack.eMd39b/_new  2020-06-05 20:27:26.877026650 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cutecom
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,20 @@
 Name:           cutecom
 Version:        0.51.0
 Release:        0
-Url:            https://gitlab.com/cutecom/cutecom
 Summary:        A graphical serial terminal 
 License:        GPL-3.0-or-later
 Group:          System/X11/Terminals
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+URL:            https://gitlab.com/cutecom/cutecom
+Source:         %{name}-%{version}.tgz
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Fix-build-with-Qt-5.15.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
-BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  libqt5-qtserialport-devel
-Source:         %{name}-%{version}.tgz
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5SerialPort)
+BuildRequires:  cmake(Qt5Widgets)
 
 %description
 CuteCom is a graphical serial terminal, similar to minicom. It is
@@ -38,34 +42,28 @@
 terminal to talk to their devices.
 
 %prep
-%setup
+%autosetup -p1
 
 %build
-cmake .
-make
+%cmake
+%cmake_build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -s -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/
-gzip %{name}.1
-install -m 644 %{name}.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/
-
-install -d 755 $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 644 distribution/openSUSE/cutecom.desktop 
$RPM_BUILD_ROOT%{_datadir}/applications/
-install -d 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 644 images/cutecom.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+%cmake_install
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+install -Dpm 644 %{name}.1 \
+  %{buildroot}/%{_mandir}/man1/%{name}.1
+install -Dpm 644 distribution/openSUSE/cutecom.desktop \
+  %{buildroot}%{_datadir}/applications/cutecom.desktop
+install -Dpm 644 images/cutecom.svg \
+  %{buildroot}%{_datadir}/pixmaps/cutecom.svg
 
 %files
-%defattr(-,root,root)
+%license LICENSE
+%doc Changelog TODO CREDITS README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1%{?ext_man}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/cutecom.svg
-%doc Changelog TODO CREDITS README.md
-%license LICENSE
 
 %changelog

++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++
>From bdd32e7c0e24a72db1d724e4a21e0444bb04272c Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <[email protected]>
Date: Thu, 4 Jun 2020 18:48:30 +0200
Subject: [PATCH] Fix build with Qt 5.15

---
 ctrlcharacterspopup.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ctrlcharacterspopup.cpp b/ctrlcharacterspopup.cpp
index cec38d1..6557154 100644
--- a/ctrlcharacterspopup.cpp
+++ b/ctrlcharacterspopup.cpp
@@ -23,6 +23,7 @@
 #include <QApplication>
 #include <QKeyEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPoint>
 #include <QPushButton>
 #include <QSignalMapper>
-- 
2.26.2


Reply via email to