public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/cqrlog] rawhide: Update to 3.0.0
@ 2026-08-18 0:20 Steven A. Falco
0 siblings, 0 replies; only message in thread
From: Steven A. Falco @ 2026-08-18 0:20 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/cqrlog
Branch : rawhide
Commit : e0b02614cac85f0b86a30783b5006546d76c3433
Author : Steven A. Falco <stevenfalco@gmail.com>
Date : 2026-08-17T14:28:58-04:00
Stats : +102/-111 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/cqrlog/c/e0b02614cac85f0b86a30783b5006546d76c3433?branch=rawhide
Log:
Update to 3.0.0
---
diff --git a/.gitignore b/.gitignore
index d7735cc..879e00f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/cqrlog-2.5.0.tar.gz
/cqrlog-2.5.1.tar.gz
/cqrlog-2.5.2.tar.gz
+/cqrlog-3.0.0.tar.gz
diff --git a/cqrlog-clublog.patch b/cqrlog-clublog.patch
index 145313c..dc7208f 100644
--- a/cqrlog-clublog.patch
+++ b/cqrlog-clublog.patch
@@ -1,27 +1,19 @@
-diff -ur cqrlog-2.5.2.original/help/h1.html cqrlog-2.5.2/help/h1.html
---- cqrlog-2.5.2.original/help/h1.html 2021-02-12 11:24:42.000000000 -0500
-+++ cqrlog-2.5.2/help/h1.html 2026-07-07 18:31:41.932470059 -0400
-@@ -708,7 +708,7 @@
- <img src="img/h1114b.png"><br><br>
+From 187727b45166e2fd22989bfb0e80b1dd11fda704 Mon Sep 17 00:00:00 2001
+From: "Steven A. Falco" <stevenfalco@gmail.com>
+Date: Mon, 17 Aug 2026 12:25:54 -0400
+Subject: Redo clublog patch
+
+
+diff --git a/help/h1.html b/help/h1.html
+index 33cb9c3..eb7b513 100644
+--- a/help/h1.html
++++ b/help/h1.html
+@@ -842,7 +842,7 @@ There are no known dependencies issues.<br><br>
+
<a name=ch7><h2><strong>Online log upload support</strong></h2></a>
CQRLOG supports online log upload to <a href="http://HamQTH.com">HamQTH</a>,
-- <a href="https://secure.clublog.org/loginform.php">ClubLog.org</a> and
-+ <a href="https://clublog.org/loginform.php">ClubLog.org</a> and
- <a href="http://hrdlog.net/">HRDLOG.net</a><br>
+- <a href="https://secure.clublog.org/loginform.php">ClubLog.org</a>,
++ <a href="https://clublog.org/loginform.php">ClubLog.org</a>,
+ <a href="http://hrdlog.net/">HRDLOG.net</a> and
+ <a href="https://n1mmwp.hamdocs.com/appendices/external-udp-broadcasts/#contact">N1MM+ UDP contact messages</a><br>
<img src="img/h1116.png"><br><br>
- Both ClubLog and HamQTH need a username and password, Clublog also needs the email address
-diff -ur cqrlog-2.5.2.original/src/dLogUpload.pas cqrlog-2.5.2/src/dLogUpload.pas
---- cqrlog-2.5.2.original/src/dLogUpload.pas 2021-02-12 11:24:42.000000000 -0500
-+++ cqrlog-2.5.2/src/dLogUpload.pas 2026-07-07 18:32:03.844976966 -0400
-@@ -598,9 +598,9 @@
- upHamQTH : Result := 'http://www.hamqth.com/qso_realtime.php';
- upClubLog : begin
- if (cmd='DELETE') then
-- Result := 'https://secure.clublog.org/delete.php'
-+ Result := 'https://clublog.org/delete.php'
- else
-- Result := 'https://secure.clublog.org/realtime.php'
-+ Result := 'https://clublog.org/realtime.php'
- end;
- upHrdLog : Result := 'http://robot.hrdlog.net/NewEntry.aspx'
- end //case
diff --git a/cqrlog-fpc-3.2.4.patch b/cqrlog-fpc-3.2.4.patch
deleted file mode 100644
index dc46ced..0000000
--- a/cqrlog-fpc-3.2.4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -rU4 cqrlog-2.5.2--orig/src/lnet/lib/lcommon.pp cqrlog-2.5.2--patched/src/lnet/lib/lcommon.pp
---- cqrlog-2.5.2--orig/src/lnet/lib/lcommon.pp 2021-02-12 17:24:42.000000000 +0100
-+++ cqrlog-2.5.2--patched/src/lnet/lib/lcommon.pp 2025-08-15 10:51:59.313858609 +0200
-@@ -460,9 +460,13 @@
- end;
-
- function TZSeconds: Integer; inline;
- begin
-+{$IF FPC_FULLVERSION > 30202}
-+ Result := unix.TZSeconds;
-+{$ELSE}
- Result := unixutil.TZSeconds;
-+{$ENDIF}
- end;
-
- {$ENDIF}
-
-diff -rU4 cqrlog-2.5.2--orig/src/lnet/lib/sys/osunits.inc cqrlog-2.5.2--patched/src/lnet/lib/sys/osunits.inc
---- cqrlog-2.5.2--orig/src/lnet/lib/sys/osunits.inc 2021-02-12 17:24:42.000000000 +0100
-+++ cqrlog-2.5.2--patched/src/lnet/lib/sys/osunits.inc 2025-08-15 11:00:17.226112454 +0200
-@@ -3,8 +3,11 @@
- {$endif}
-
- {$ifdef UNIX}
- BaseUnix, NetDB,
-+ {$IF FPC_FULLVERSION > 30202}
-+ Unix,
-+ {$ENDIF}
- {$endif}
-
- {$ifdef NETWARE}
- WinSock,
diff --git a/cqrlog-install.patch b/cqrlog-install.patch
index 4c601a6..f03c432 100644
--- a/cqrlog-install.patch
+++ b/cqrlog-install.patch
@@ -1,11 +1,30 @@
-Index: cqrlog-2.5.0/Makefile
-===================================================================
---- cqrlog-2.5.0.orig/Makefile
-+++ cqrlog-2.5.0/Makefile
-@@ -7,14 +7,13 @@ tmpdir = /tmp
+From 2943ff809eb7f85267cd4c30826058c548ab1f61 Mon Sep 17 00:00:00 2001
+From: "Steven A. Falco" <stevenfalco@gmail.com>
+Date: Mon, 17 Aug 2026 12:18:30 -0400
+Subject: Redo install patch
+
+
+diff --git a/Makefile b/Makefile
+index 871962c..e629afa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,9 +11,9 @@ else
+ WS ?= qt6
+ endif
+ #
+-datadir = $(DESTDIR)/share/cqrlog
+-bindir = $(DESTDIR)/bin
+-sharedir = $(DESTDIR)/share
++datadir = $(DESTDIR)/usr/share/cqrlog
++bindir = $(DESTDIR)/usr/bin
++sharedir = $(DESTDIR)/usr/share
+ tmpdir = /tmp
+ PWD = $(shell pwd)
+
+@@ -36,14 +36,13 @@ CQR_BUILD := $(shell git rev-list --count HEAD 2>/dev/null || echo $(CQR_BUILD_F
cqrlog: src/cqrlog.lpi
- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ $(LAZBUILD) --ws=$(WS) src/cqrlog.lpi
- $(ST) src/cqrlog
gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
@@ -18,48 +37,58 @@ Index: cqrlog-2.5.0/Makefile
rm -rf src/backup
rm -f -v src/richmemo/*.o src/richmemo/*.ppu src/richmemo/gtk2/*.ppu src/richmemo/gtk2/*.o
rm -f -v tools/adif_hash_generator tools/adif_hash_generator.lpi tools/adif_hash_generator.lps
-@@ -34,8 +33,8 @@ install:
- install -d -v $(datadir)/images/icon/64x64
- install -d -v $(datadir)/images/icon/128x128
- install -d -v $(datadir)/images/icon/256x256
-- install -d -v $(sharedir)/pixmaps/cqrlog
-- install -d -v $(sharedir)/icons/cqrlog
-+# install -d -v $(sharedir)/pixmaps/cqrlog
-+# install -d -v $(sharedir)/icons/cqrlog
- install -d -v $(sharedir)/applications
- install -d -v $(sharedir)/appdata
- install -d -v $(sharedir)/man/man1
-@@ -52,8 +51,8 @@ install:
- install -v -m 0644 zipcodes/* $(datadir)/zipcodes/
- # install -v -m 0644 -t images/* $(datadir)/images/
- cp -v -R images/* $(datadir)/images
-- cp -v -R images/icon/* $(sharedir)/icons/cqrlog
-- cp -v -R images/icon/* $(sharedir)/pixmaps/cqrlog
-+# cp -v -R images/icon/* $(sharedir)/icons/cqrlog
-+# cp -v -R images/icon/* $(sharedir)/pixmaps/cqrlog
- # install -v -m 0644 images/icon/32x32/* $(datadir)/images/icon/32x32/
- # install -v -m 0644 images/icon/64x64/* $(datadir)/images/icon/64x64/
- # install -v -m 0644 images/icon/128x128/* $(datadir)/images/icon/128x128/
-@@ -61,17 +60,17 @@ install:
- # install -v -m 0644 images/* $(datadir)/images/
- install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop
- install -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/appdata/cqrlog.appdata.xml
-- install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
-- install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
-+# install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
-+# install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
+@@ -102,7 +101,7 @@ install:
+ install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/hicolor/128x128/apps/cqrlog.png
+ install -v -m 0644 images/icon/256x256/cqrlog.png $(sharedir)/icons/hicolor/256x256/apps/cqrlog.png
install -v -m 0644 src/changelog.html $(datadir)/changelog.html
- install -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz
-+ install -v -m 0644 tools/cqrlog.1 $(sharedir)/man/man1/cqrlog.1
- deb:
- dpkg-buildpackage -rfakeroot -i -I
- deb_src:
- dpkg-buildpackage -rfakeroot -i -I -S
- debug:
-- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
++ install -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1
+ deb: dependencies ## Build a deb package (Linux, via tools/makedeb.sh)
+ ./tools/makedeb.sh
+ deb_src: ## Build a deb package with source (Linux)
+@@ -113,7 +112,6 @@ debug:
+
+ cqrlog_qt5: src/cqrlog.lpi
+ $(LAZBUILD) --ws=qt5 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- $(ST) src/cqrlog
+ gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
+
+ cqrlog_qt5_debug: src/cqrlog.lpi
+@@ -122,7 +120,6 @@ cqrlog_qt5_debug: src/cqrlog.lpi
+
+ cqrlog_qt6: src/cqrlog.lpi
+ $(LAZBUILD) --ws=qt6 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- $(ST) src/cqrlog
+ gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
+
+ cqrlog_qt6_debug: src/cqrlog.lpi
+@@ -132,13 +129,12 @@ cqrlog_qt6_debug: src/cqrlog.lpi
+ # GTK2 fallback build (Linux). Default build is QT6; use these only if a GTK2
+ # binary is ever needed again.
+ cqrlog_gtk2: src/cqrlog.lpi
+- $(LAZBUILD) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- $(ST) src/cqrlog
- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
-+ $(CC) --bm=debug --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
++ $(LAZBUILD) --bm=debug --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ gzip tools/cqrlog.1 -c > tools/cqrlog.1
- cqrlog_qt5: src/cqrlog.lpi
- $(CC) --ws=qt5 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ cqrlog_gtk2_debug: src/cqrlog.lpi
+ $(LAZBUILD) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
++ gzip tools/cqrlog.1 -c > tools/cqrlog.1
+
+ # macOS .app bundle
+ APPBUNDLE = $(DESTDIR)/CQRLOG.app
+diff --git a/src/cqrlog.lpi b/src/cqrlog.lpi
+index 3954a07..32a48c5 100644
+--- a/src/cqrlog.lpi
++++ b/src/cqrlog.lpi
+@@ -944,7 +944,7 @@
+ </CodeGeneration>
+ <Linking>
+ <Debugging>
+- <GenerateDebugInfo Value="False"/>
++ <GenerateDebugInfo Value="True"/>
+ <DebugInfoType Value="dsDwarf2Set"/>
+ </Debugging>
+ </Linking>
diff --git a/cqrlog.spec b/cqrlog.spec
index 3c057ca..4f532b4 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -1,6 +1,6 @@
Name: cqrlog
-Version: 2.5.2
-Release: 25%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: An amateur radio contact logging program
# Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -11,10 +11,7 @@ Source0: https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version}
# Fixes arm builds, translation improvements, and other bug fixes.
Patch0: cqrlog-install.patch
Patch1: cqrlog-desktop.patch
-
-# Fix build failure with FPC 3.2.4 (some symbols were moved around in RTL)
-Patch2: cqrlog-fpc-3.2.4.patch
-Patch3: cqrlog-clublog.patch
+Patch2: cqrlog-clublog.patch
ExclusiveArch: %{fpc_arches}
@@ -23,6 +20,7 @@ BuildRequires: fpc >= 3.0.4
BuildRequires: lazarus >= 1.8
BuildRequires: libappstream-glib
BuildRequires: make
+BuildRequires: lazarus-lcl-qt6
Requires: mariadb-server-any
Recommends: mariadb-server
@@ -90,7 +88,7 @@ iconv -f iso8859-1 -t utf-8 %{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt >
%check
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
%files
@@ -98,13 +96,16 @@ appstream-util validate-relax --nonet \
%doc README.md AUTHORS CHANGELOG
%{_bindir}/%{name}
%{_datadir}/%{name}/
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/com.%{name}.%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/cqrlog.1.gz
%changelog
+* Mon Aug 17 2026 Steven A. Falco <stevenfalco@gmail.com> - 3.0.0-1
+- Update to 3.0.0
+
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 4260bbb..710bf4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cqrlog-2.5.2.tar.gz) = 5546117f0dcec7529505d6f979be2c9eeebdcf499493971b19d4301296b52a0612d490b6e3f1f4fa759d9f3d2fc0b9b42fbf0e8de862b25ddc75819855dfb407
+SHA512 (cqrlog-3.0.0.tar.gz) = 8f5b5a85a62c6bec784bbcff4180822d6d08cd876b1473b2ac564691079a287c385fa5e92be44728090c49c27435f72467ab15819b4165ef587f9ac2636a8d71
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-18 0:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-18 0:20 [rpms/cqrlog] rawhide: Update to 3.0.0 Steven A. Falco
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox