diff --git a/.gitignore b/.gitignore index 1c4cc41..c82d6e2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /chirp-daily-20170115.tar.gz /chirp-daily-20170222.tar.gz /chirp-daily-20170711.tar.gz +/chirp-daily-20171204.tar.gz diff --git a/chirp-0.2.2-install.patch b/chirp-0.2.2-install.patch deleted file mode 100644 index 088903f..0000000 --- a/chirp-0.2.2-install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- chirp-0.2.2/setup.py.inst 2012-03-24 02:01:12.000000000 -0500 -+++ chirp-0.2.2/setup.py 2012-06-04 10:39:43.681590064 -0500 -@@ -110,7 +110,6 @@ - data_files=[('share/applications', desktop_files), - ('share/chirp/images', image_files), - ('share/chirp', xsd_files), -- ('share/doc/chirp', ['COPYING']), - ('share/pixmaps', ['share/chirp.png']), - ('share/man/man1', ["share/chirpw.1"]), - ('share/chirp/stock_configs', stock_configs), diff --git a/chirp-install.patch b/chirp-install.patch new file mode 100644 index 0000000..ad55ceb --- /dev/null +++ b/chirp-install.patch @@ -0,0 +1,10 @@ +--- a/setup.py ++++ b/setup.py +@@ -129,7 +129,6 @@ def default_build(): + data_files=[('share/applications', desktop_files), + ('share/chirp/images', image_files), + ('share/chirp', xsd_files), +- ('share/doc/chirp', ['COPYING']), + ('share/pixmaps', ['share/chirp.png']), + ('share/man/man1', ["share/chirpw.1"]), + ('share/chirp/stock_configs', stock_configs), diff --git a/chirp.spec b/chirp.spec index 5534afe..203de91 100644 --- a/chirp.spec +++ b/chirp.spec @@ -1,8 +1,9 @@ %global src_name chirp-daily +%global debug_package %{nil} Name: chirp -Version: 20170711 -Release: 2%{?dist} +Version: 20171204 +Release: 1%{?dist} Summary: A tool for programming two-way radio equipment Group: Applications/Communications @@ -11,7 +12,7 @@ URL: http://chirp.danplanet.com/ Source0: http://trac.chirp.danplanet.com/chirp_daily/daily-%{version}/%{src_name}-%{version}.tar.gz Source1: %{name}.desktop -Patch0: chirp-0.2.2-install.patch +Patch0: chirp-install.patch BuildArch: noarch @@ -34,8 +35,7 @@ the hood. %prep -%setup -q -n %{src_name}-%{version} -%patch0 -p1 -b .inst +%autosetup -p1 -n %{src_name}-%{version} %build @@ -47,7 +47,7 @@ the hood. # Wrong .desktop config lets install the correct .desktop desktop-file-install \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %find_lang CHIRP @@ -55,18 +55,25 @@ desktop-file-install \ %files -f CHIRP.lang %license COPYING %{_bindir}/chirpw +%{_bindir}/rpttool %{python_sitelib}/%{src_name}_%{version}-py2.7.egg-info %{python_sitelib}/%{name}/ %{_datadir}/applications/%{name}.desktop -%exclude %{_datadir}/%{name}/locale %{_datadir}/%{name}/ %{_mandir}/man1/chirpw.1.gz %{_datadir}/pixmaps/%{name}.png +%exclude %{_datadir}/%{name}/locale %changelog -* Wed Jul 26 2017 Fedora Release Engineering - 20170711-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Wed Dec 06 2017 Richard Shaw - 20171204-1 +- Update to latest upstream release. + +* Fri Nov 17 2017 Richard Shaw - 20171104-1 +- Update to latest upstream release. + +* Fri Sep 22 2017 Richard Shaw - 20170714-1 +- Update to latest upstream release. * Tue Jul 11 2017 Richard Shaw - 20170711-1 - Update to latest upstream release. diff --git a/sources b/sources index 33e5a3c..3d86a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chirp-daily-20170711.tar.gz) = 6733d5f0716843433739447300769949acaad88d41aa8fb082005f8d4a070f8b89a7640dc319efa02dcfd47fd81c12e3c08c585c6d227fe8adbd35d022991845 +SHA512 (chirp-daily-20171204.tar.gz) = 0b1ea8f4fe03ffbac4624713607c6e37b112d583b32e008fcb4dcfadbaa1f1af0f8cfec2e3f07bae4f84c5ec4e5986f917327b6098584abb33b1ab1cd992ca1b