The package rpms/cqrlog.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/cqrlog.git/commit/?id=a37ad35d114d21....
Change: +ExcludeArch: armv7hl
Thanks.
Full change: ============
commit a37ad35d114d21f986df99a2a3ee5f72923ead45 Author: Richard Shaw hobbes1069@gmail.com Date: Sun Dec 31 08:30:36 2017 -0600
Update to latest upstream release. Disable armv7hl on rawhide/28 until fpc is fixed.
diff --git a/.gitignore b/.gitignore index 829b9db..92483cf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /cqrlog-2.0.4.tar.gz /cqrlog-2.0.5.tar.gz /cqrlog-2.1.0.tar.gz +/cqrlog-2.2.0.tar.gz diff --git a/cqrlog-install.patch b/cqrlog-install.patch index c47a2eb..ef898d2 100644 --- a/cqrlog-install.patch +++ b/cqrlog-install.patch @@ -9,7 +9,7 @@
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 -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh src/*.rst src/*.a src/synapse/*.a src/synapse/*.o src/synapse/*.ppu rm -rf debian/cqrlog rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o - rm -f -v tools/cqrlog.1.gz diff --git a/cqrlog.spec b/cqrlog.spec index db24f74..f939617 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: An amateur radio contact logging program
License: GPLv2 @@ -9,9 +9,13 @@ Source0: https://github.com/ok2cqr/cqrlog/archive/v%%7Bversion%7D/%%7Bname%7D-%%7Bver...
Patch0: cqrlog-install.patch Patch1: cqrlog-desktop.patch -Patch2: cqrlog-debug.patch
ExclusiveArch: %{fpc_arches} +# fpc broken in rawhide, see: +# https://bugzilla.redhat.com/show_bug.cgi?id=1517323 +%if 0%{?fedora} >= 28 +ExcludeArch: armv7hl +%endif
BuildRequires: fpc >= 2.6.4 BuildRequires: lazarus @@ -108,6 +112,10 @@ fi
%changelog +* Sun Dec 31 2017 Richard Shaw hobbes1069@gmail.com - 2.2.0-1 +- Update to latest upstream release. +- Disable armv7hl on rawhide/28 until fpc is fixed. + * Fri Sep 22 2017 Richard Shaw hobbes1069@gmail.com - 2.1.0-2 - Fix mariadb requires for Fedora 28 and up. https://bugzilla.redhat.com/show_bug.cgi?id=1486480 diff --git a/sources b/sources index a660b0a..01adcf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cqrlog-2.1.0.tar.gz) = df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e +SHA512 (cqrlog-2.2.0.tar.gz) = 7c977b44a40da30e1c9e27c62ee5ba19c4cc9f537164f18f960a65ba7bcd546f4abb937f6057bd90ea81c50bea5ceff1fda77a2ef48cd98f1a67712257ac2431
commit 6a4381f1886f0a97f0819f9a00e20ffd94e2b94c Author: Richard Shaw hobbes1069@gmail.com Date: Fri Sep 22 07:50:35 2017 -0500
Fix mariadb requires for Fedora 28 and up. https://bugzilla.redhat.com/show_bug.cgi?id=1486480
diff --git a/cqrlog.spec b/cqrlog.spec index 910061b..db24f74 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An amateur radio contact logging program
License: GPLv2 @@ -19,7 +19,12 @@ BuildRequires: libappstream-glib BuildRequires: desktop-file-utils
Requires: mariadb-server +# https://bugzilla.redhat.com/show_bug.cgi?id=1486480 +%if 0%{?fedora} >= 28 +Requires: mariadb-connector-c +%else Requires: mariadb-libs +%endif Requires: hamlib Requires: openssl %if 0%{?fedora} @@ -103,6 +108,10 @@ fi
%changelog +* Fri Sep 22 2017 Richard Shaw hobbes1069@gmail.com - 2.1.0-2 +- Fix mariadb requires for Fedora 28 and up. + https://bugzilla.redhat.com/show_bug.cgi?id=1486480 + * Mon Aug 07 2017 Richard Shaw hobbes1069@gmail.com - 2.1.0-1 - Update to latest upstream release.
commit 39f965c37271f9b6ac0a952987761d98ae0535ac Author: Richard Shaw hobbes1069@gmail.com Date: Thu Sep 14 09:58:54 2017 -0500
Upload new source.
diff --git a/.gitignore b/.gitignore index 4611ce2..829b9db 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cqrlog-2.0.2.tar.gz /cqrlog-2.0.4.tar.gz /cqrlog-2.0.5.tar.gz +/cqrlog-2.1.0.tar.gz diff --git a/sources b/sources index 4c862d8..a660b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cqrlog-2.0.5.tar.gz) = daa63936f172e75ee01554bde7d5f9dde478ac18c7a81bedd6bad860275cd3e5e93b56de6183b80a991de56877e7f6d29d9aea5aa17fc2151939ebc0699aa329 +SHA512 (cqrlog-2.1.0.tar.gz) = df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
commit 2ebcc7f5e897f8dfb7e6d399938f19ed2d90e2ec Author: Richard Shaw hobbes1069@gmail.com Date: Thu Sep 14 09:56:19 2017 -0500
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@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%%7Bversion%7D/%%7Bname%7D-%%7Bver...
-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@gmail.com - 2.1.0-1 +- Update to latest upstream release. + * Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 2.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit bdd9711bd695bc8f65614b35483b0016a22aabd9 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Aug 2 19:14:48 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/cqrlog.spec b/cqrlog.spec index aaad0ac..6775257 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An amateur radio contact logging program
License: GPLv2 @@ -99,6 +99,9 @@ fi
%changelog +* Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering releng@fedoraproject.org - 2.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit c83d09eed9b42e880790307c35ce36e6b1fa4a4f Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jul 26 05:36:31 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/cqrlog.spec b/cqrlog.spec index 5bde8d3..aaad0ac 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An amateur radio contact logging program
License: GPLv2 @@ -99,6 +99,9 @@ fi
%changelog +* Wed Jul 26 2017 Fedora Release Engineering releng@fedoraproject.org - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Mar 13 2017 Richard Shaw hobbes1069@gmail.com - 2.0.5-1 - Update to latest upstream release, 2.0.5. - Fix icon install location, fixes BZ#1440477.
arch-excludes@lists.fedoraproject.org