diff --git a/cqrlog-1.9.1-build.patch b/cqrlog-1.9.1-build.patch new file mode 100644 index 0000000..1c7a291 --- /dev/null +++ b/cqrlog-1.9.1-build.patch @@ -0,0 +1,31 @@ +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 +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.spec b/cqrlog.spec index 9f1715c..66ce922 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,14 +1,15 @@ Name: cqrlog Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An amateur radio contact logging program License: GPLv2 URL: http://www.cqrlog.com/ Source0: https://github.com/ok2cqr/cqrlog/archive/v1.9.1/%{name}-%{version}.tar.gz -Patch0: cqrlog-1.9.0-install.patch -Patch1: cqrlog-1.9.1-desktop.patch +Patch0: cqrlog-1.9.0-install.patch +Patch1: cqrlog-1.9.1-desktop.patch +Patch2: cqrlog-1.9.1-build.patch # fpc not available on these arches #ExcludeArch: s390 s390x armv7hl @@ -17,12 +18,13 @@ ExcludeArch: s390 s390x BuildRequires: fpc >= 2.6.4 BuildRequires: lazarus BuildRequires: desktop-file-utils + Requires: mariadb-server -Requires: hamlib -Requires: openssl-devel Requires: mariadb-libs +Requires: hamlib +Requires: openssl %if 0%{?fedora} -Requires: trustedqsl +Requires: tqsllib %endif @@ -39,6 +41,7 @@ operation and maintenance. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 chmod -x src/azidis3.pas chmod -x src/gline2.pas @@ -58,109 +61,34 @@ make %{?_smp_mflags} desktop-file-validate %{buildroot}%{_datadir}/applications/cqrlog.desktop -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/ctyfiles/lotw1.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/ria.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/okdxf.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/htc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/pro.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/9acwg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/gqrpc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/prl.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/ctyfiles/iota.tbl -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/ffr.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/mfca.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/firac.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cwsp.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/gacw.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/conveniat.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/was.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/jaig.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/mcl.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cft.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/epc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/tfc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/fmc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/hh.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/okdxc.txt +mv %{buildroot}%{_datadir}/pixmaps/cqrlog/cqrlog.png \ + %{buildroot}%{_datadir}/pixmaps/ + +for file in $(find %{buildroot}%{_datadir}/%{name} -name "*.txt"); do + sed -i 's/\r//' $file +done sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/ctyfiles/CountryDel.tab -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/qthloc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/070-club.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/dtc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/afm.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/prc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/rtc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/rnars.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/okqrp.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/a1-op.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/mcwg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/rsars.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/fnars.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/trc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/mf.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/hacwg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/wff.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/udxc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/marac.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/nra.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/wwyc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/bcc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/ctc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/bscc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/ehsc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/tenten.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/spcwc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/armi.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/ten-ten.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/vhsc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cwjf.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/spar.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cav.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/vrk.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/wap.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/wcc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/uksmg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/inorc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/fists.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/yasme.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/uft.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/mdxg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/shsc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/rafars.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/gdxf.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cfo.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cct.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/cdxc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/spar-rcc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/marconista.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/fog.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/sdxg.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/spdxc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/bmars.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/qcwa.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/hhc.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/rrdxa.txt -sed -i 's/\r//' %{buildroot}%{_datadir}/%{name}/members/arktika.txt 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 %files -%if 0%{?rhel} < 7 || 0%{?fedora} < 21 -%doc src/COPYING -%else %license src/COPYING -%endif %doc README.md src/AUTHORS src/CHANGELOG src/README %{_bindir}/cqrlog %{_datadir}/%{name}/ %{_datadir}/applications/cqrlog.desktop -%{_datadir}/pixmaps/cqrlog/cqrlog.png +%{_datadir}/pixmaps/cqrlog.png %{_mandir}/man1/cqrlog.1.gz %changelog +* Thu Mar 24 2016 Richard Shaw - 1.9.1-3 +- Update to latest upstream release. +- Add patch to deal with newer fpc. +- Remove old dependency on openssl-devel. + * Wed Feb 03 2016 Fedora Release Engineering - 1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild