From f3abc41b5a3bae2e679380818efee87ba4228177 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Jan 17 2017 14:13:56 +0000 Subject: Update to latest upstream release. --- diff --git a/.gitignore b/.gitignore index c70b423..57cca31 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cqrlog-1.9.1.tar.gz /cqrlog-2.0.1.tar.gz /cqrlog-2.0.2.tar.gz +/cqrlog-2.0.4.tar.gz diff --git a/cqrlog-1.9.0-install.patch b/cqrlog-1.9.0-install.patch deleted file mode 100644 index 537cd6b..0000000 --- a/cqrlog-1.9.0-install.patch +++ /dev/null @@ -1,30 +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) -@@ -46,9 +44,8 @@ install: - install -v -m 0644 images/* $(datadir)/images/ - install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop - install -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png -- install -v -m 0644 images/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-2.0.4-install.patch b/cqrlog-2.0.4-install.patch new file mode 100644 index 0000000..3e98297 --- /dev/null +++ b/cqrlog-2.0.4-install.patch @@ -0,0 +1,28 @@ +--- 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) +@@ -60,7 +58,7 @@ install: + install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png + # install -v -m 0644 images/icon/* $(sharedir)/icons/cqrlog/ + 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.spec b/cqrlog.spec index e4d2528..60868b2 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,5 +1,5 @@ Name: cqrlog -Version: 2.0.2 +Version: 2.0.4 Release: 1%{?dist} Summary: An amateur radio contact logging program @@ -7,7 +7,7 @@ License: GPLv2 URL: http://www.cqrlog.com/ Source0: https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: cqrlog-1.9.0-install.patch +Patch0: cqrlog-2.0.4-install.patch Patch1: cqrlog-1.9.1-desktop.patch Patch2: cqrlog-1.9.1-build.patch @@ -61,8 +61,11 @@ make %{?_smp_mflags} desktop-file-validate %{buildroot}%{_datadir}/applications/cqrlog.desktop -mv %{buildroot}%{_datadir}/pixmaps/cqrlog/cqrlog.png \ - %{buildroot}%{_datadir}/pixmaps/ +# As of 2.0.4 cqrlog puts icons in both /usr/share/icons and /usr/share/pixmaps +# incorrectly fix it here. +mv %{buildroot}%{_datadir}/icons/cqrlog \ + %{buildroot}%{_datadir}/icons/hicolor +rm -rf %{buildroot}%{_datadir}/pixmaps for file in $(find %{buildroot}%{_datadir}/%{name} -name "*.txt"); do sed -i 's/\r//' $file @@ -73,17 +76,33 @@ 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 +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %license src/COPYING %doc README.md src/AUTHORS src/CHANGELOG src/README -%{_bindir}/cqrlog +%{_bindir}/%{name} %{_datadir}/%{name}/ -%{_datadir}/applications/cqrlog.desktop -%{_datadir}/pixmaps/cqrlog.png +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/%{name}.png %{_mandir}/man1/cqrlog.1.gz %changelog +* Tue Jan 17 2017 Richard Shaw - 2.0.4-1 +- Update to latest upstream release. + * Mon Aug 29 2016 Richard Shaw - 2.0.2-1 - Update to latest upstream release. diff --git a/sources b/sources index 42a5285..d22338e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b6a1c7102b2d58d87dac5592efc3174 cqrlog-2.0.2.tar.gz +SHA512 (cqrlog-2.0.4.tar.gz) = 439236aec08c8088e7f039a8999c7ef45fdf35ca21251168943d8f113140a1ee985c1e1c5fec1877e43007d6c81ed20350075ffe4433ee18b210668e8a13b671