From 2ebcc7f5e897f8dfb7e6d399938f19ed2d90e2ec Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sep 14 2017 14:56:19 +0000
Subject: Update to latest upstream release.
---
diff --git a/cqrlog-1.9.1-build.patch b/cqrlog-1.9.1-build.patch
deleted file mode 100644
index 1c7a291..0000000
--- a/cqrlog-1.9.1-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix build with fpc 3.0
- Some deprecated field name aliases were removed in fpc 3.0. Update the code
- to use non-deprecated names.
-Author: Peter Michael Green <plugwash(a)debian.org>
-Bug-Debian:
https://bugs.debian.org/813461
-
-Index: cqrlog-1.9.0.new/src/lnet/lib/lcommon.pp
-===================================================================
---- cqrlog-1.9.0.new.orig/src/lnet/lib/lcommon.pp
-+++ cqrlog-1.9.0.new/src/lnet/lib/lcommon.pp
-@@ -512,15 +512,15 @@ end;
- procedure FillAddressInfo(var aAddrInfo: TLSocketAddress; const aFamily: sa_family_t;
- const Address: string; const aPort: Word);
- begin
-- aAddrInfo.IPv4.family := aFamily;
-- aAddrInfo.IPv4.Port := htons(aPort);
-+ aAddrInfo.IPv4.sin_family := aFamily;
-+ aAddrInfo.IPv4.sin_port := htons(aPort);
-
- case aFamily of
- LAF_INET :
- begin
-- aAddrInfo.IPv4.Addr := StrToNetAddr(Address);
-- if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.Addr = 0) then
-- aAddrInfo.IPv4.Addr := StrToNetAddr(GetHostIP(Address));
-+ aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(Address);
-+ if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.sin_addr.s_addr = 0) then
-+ aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(GetHostIP(Address));
- end;
- LAF_INET6 :
- begin
diff --git a/cqrlog-1.9.1-desktop.patch b/cqrlog-1.9.1-desktop.patch
deleted file mode 100644
index 3e37ea0..0000000
--- a/cqrlog-1.9.1-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tools/cqrlog.desktop
-+++ b/tools/cqrlog.desktop
-@@ -4,7 +4,7 @@ Comment=Advanced logging program for ham
- Exec=cqrlog
- Terminal=false
- Type=Application
--Icon=cqrlog.png
--Categories=Utility;Database;HamRadio
-+Icon=cqrlog
-+Categories=Utility;Database;HamRadio;
- Keywords=Ham;Radio;Log;
-
diff --git a/cqrlog-2.0.5-install.patch b/cqrlog-2.0.5-install.patch
deleted file mode 100644
index 0ea04e0..0000000
--- a/cqrlog-2.0.5-install.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -7,15 +7,13 @@ tmpdir = /tmp
-
- cqrlog: src/cqrlog.lpi
- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-- $(ST) src/cqrlog
-- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
-
- clean:
- rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o
src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled debian/cqrlog.* src/ipc/*.o
src/ipc/*.ppu src/cqrlog.or
- rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh src/*.rst src/*.a
- rm -rf debian/cqrlog
- rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o
-- rm -f -v tools/cqrlog.1.gz
-+ rm -f -v tools/cqrlog.1
-
- install:
- install -d -v $(bindir)
-@@ -32,8 +30,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)/man/man1
- install -v -m 0755 src/cqrlog $(bindir)
-@@ -49,18 +47,18 @@ 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/
- # install -v -m 0644 images/icon/256x256/* $(datadir)/images/icon/256x256/
- # install -v -m 0644 images/* $(datadir)/images/
- install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop
-- 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
- 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:
diff --git a/cqrlog-debug.patch b/cqrlog-debug.patch
new file mode 100644
index 0000000..18df97d
--- /dev/null
+++ b/cqrlog-debug.patch
@@ -0,0 +1,12 @@
+--- a/src/cqrlog.lpi
++++ b/src/cqrlog.lpi
+@@ -773,7 +773,8 @@
+ </CodeGeneration>
+ <Linking>
+ <Debugging>
+- <GenerateDebugInfo Value="False"/>
++ <GenerateDebugInfo Value="True"/>
++ <DebugInfoType Value="dsDwarf2Set"/>
+ </Debugging>
+ </Linking>
+ <Other>
diff --git a/cqrlog-desktop.patch b/cqrlog-desktop.patch
new file mode 100644
index 0000000..f42521c
--- /dev/null
+++ b/cqrlog-desktop.patch
@@ -0,0 +1,10 @@
+--- a/tools/cqrlog.desktop
++++ b/tools/cqrlog.desktop
+@@ -5,6 +5,6 @@ Exec=cqrlog
+ Terminal=false
+ Type=Application
+ Icon=cqrlog
+-Categories=Utility;Database;HamRadio
++Categories=Utility;Database;HamRadio;
+ Keywords=Ham;Radio;Log;
+
diff --git a/cqrlog-install.patch b/cqrlog-install.patch
new file mode 100644
index 0000000..c47a2eb
--- /dev/null
+++ b/cqrlog-install.patch
@@ -0,0 +1,62 @@
+--- a/Makefile
++++ b/Makefile
+@@ -7,15 +7,13 @@ tmpdir = /tmp
+
+ cqrlog: src/cqrlog.lpi
+ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- $(ST) src/cqrlog
+- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
+
+ clean:
+ rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o
src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled debian/cqrlog.* src/ipc/*.o
src/ipc/*.ppu src/cqrlog.or
+ rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh src/*.rst src/*.a
+ rm -rf debian/cqrlog
+ rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o
+- rm -f -v tools/cqrlog.1.gz
++ rm -f -v tools/cqrlog.1
+ rm -rf src/backup
+ rm -f -v src/richmemo/*.o src/richmemo/*.ppu src/richmemo/gtk2/*.ppu
src/richmemo/gtk2/*.o
+
+@@ -34,8 +32,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 +50,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,15 +59,15 @@ 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
+ 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
+- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
++ $(CC) --bm=debug --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
++ gzip tools/cqrlog.1 -c > tools/cqrlog.1
+
diff --git a/cqrlog.spec b/cqrlog.spec
index 6775257..910061b 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -1,20 +1,21 @@
Name: cqrlog
-Version: 2.0.5
-Release: 3%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Summary: An amateur radio contact logging program
License: GPLv2
URL:
http://www.cqrlog.com/
Source0:
https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version}.t...
-Patch0: cqrlog-2.0.5-install.patch
-Patch1: cqrlog-1.9.1-desktop.patch
-Patch2: cqrlog-1.9.1-build.patch
+Patch0: cqrlog-install.patch
+Patch1: cqrlog-desktop.patch
+Patch2: cqrlog-debug.patch
ExclusiveArch: %{fpc_arches}
BuildRequires: fpc >= 2.6.4
BuildRequires: lazarus
+BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
Requires: mariadb-server
@@ -36,10 +37,7 @@ daily general logging of HF, CW & SSB contacts and strongly focused
on easy
operation and maintenance.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-#patch2 -p1
+%autosetup -p1
chmod -x src/azidis3.pas
chmod -x src/gline2.pas
@@ -75,6 +73,11 @@ sed -i 's/\r//'
%{buildroot}%{_datadir}/%{name}/ctyfiles/MASTER.SCP
iconv -f iso8859-1 -t utf-8 %{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt >
%{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt.conv && mv -f
%{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt.conv
%{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt
+%check
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -93,12 +96,16 @@ fi
%doc README.md src/AUTHORS src/CHANGELOG src/README
%{_bindir}/%{name}
%{_datadir}/%{name}/
+%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/cqrlog.1.gz
%changelog
+* Mon Aug 07 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-1
+- Update to latest upstream release.
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.5-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
https://src.fedoraproject.org/rpms/cqrlog/c/2ebcc7f5e897f8dfb7e6d399938f1...