Attachment 12783 Details for Bug 28975 – Correction diff to weather routing

[patch] Correction diff to weather routing

diff (text/plain), 1.71 KB, created by Barry Jackson on 2021-06-18 18:14:20 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2021-06-18 18:14:20 CEST

Size: 1.71 KB

patch

obsolete

>--- weather_routing.spec	2021-06-18 17:09:58.227395933 +0100
>+++ SPECS/opencpn-weather-routing-plugin.spec	2021-06-18 15:50:11.415121499 +0100
>@@ -7,8 +7,7 @@
> License:	GPLv3+
> Group:		Geography
> URL:		https://opencpn.org/OpenCPN/plugins/weatherroute.html
>-#URL of Source0:	https://github.com/rgleason/%{piname}/archive/refs/tags/v%{version}.tar.gz
>-Source0:    %{piname}-%{version}.tar.gz
>+Source0:	https://github.com/rgleason/%{piname}/archive/v%{version}/%{piname}-%{version}.tar.gz
> 
> BuildRequires:	cmake
> BuildRequires:	gettext
>@@ -29,16 +28,19 @@
> predictive grib data or averaged gridded Climate data based upon constraint
> settings, start and finish information and boat performance calculated using
> boat specs or polar data.
>-Use the Grib Plugin (included now with opencpn) and recently downloaded grib 
>+
>+Use the Grib Plugin (included now with opencpn) and recently downloaded grib
> files for completing grib predictive routing (1-8 days).
>+
> Use the Climatology Plugin to find cruising routes, (most useful in prevailing
> winds areas)
>+
> Use both grib and climatology data, allowing the grib's route to be extended
> past time/range, or to use current data if the grib does not contain it, or to
> use climatology to avoid areas of cyclones.
> 
> %prep
>-%setup -q -n %{piname}-%{version}
>+%autosetup -p1 -n %{piname}-%{version}
> 
> # To be sure to use system tinyxml headers and not bundled ones
> rm -f plugins/%{piname}/src/tinyxml/tinyxml*.cpp include/tinyxml.h
>@@ -46,14 +48,13 @@
> %build
> %cmake 
> 
>-%make -C build
>+%cmake_build
> 
> %install
>-%make_install -C build
>+%cmake_install
> 
> %find_lang opencpn-%{piname}
> 
> %files -f opencpn-%{piname}.lang
> %{_libdir}/opencpn/lib%{piname}.so
> %{_datadir}/opencpn/plugins/%{piname}/data/*
>-

--- weather_routing.spec	2021-06-18 17:09:58.227395933 +0100
+++ SPECS/opencpn-weather-routing-plugin.spec	2021-06-18 15:50:11.415121499 +0100
@@ -7,8 +7,7 @@
 License:	GPLv3+
 Group:		Geography
 URL:		https://opencpn.org/OpenCPN/plugins/weatherroute.html
-#URL of Source0:	https://github.com/rgleason/%{piname}/archive/refs/tags/v%{version}.tar.gz
-Source0:    %{piname}-%{version}.tar.gz
+Source0:	https://github.com/rgleason/%{piname}/archive/v%{version}/%{piname}-%{version}.tar.gz
 
 BuildRequires:	cmake
 BuildRequires:	gettext
@@ -29,16 +28,19 @@
 predictive grib data or averaged gridded Climate data based upon constraint
 settings, start and finish information and boat performance calculated using
 boat specs or polar data.
-Use the Grib Plugin (included now with opencpn) and recently downloaded grib 
+
+Use the Grib Plugin (included now with opencpn) and recently downloaded grib
 files for completing grib predictive routing (1-8 days).
+
 Use the Climatology Plugin to find cruising routes, (most useful in prevailing
 winds areas)
+
 Use both grib and climatology data, allowing the grib's route to be extended
 past time/range, or to use current data if the grib does not contain it, or to
 use climatology to avoid areas of cyclones.
 
 %prep
-%setup -q -n %{piname}-%{version}
+%autosetup -p1 -n %{piname}-%{version}
 
 # To be sure to use system tinyxml headers and not bundled ones
 rm -f plugins/%{piname}/src/tinyxml/tinyxml*.cpp include/tinyxml.h
@@ -46,14 +48,13 @@
 %build
 %cmake 
 
-%make -C build
+%cmake_build
 
 %install
-%make_install -C build
+%cmake_install
 
 %find_lang opencpn-%{piname}
 
 %files -f opencpn-%{piname}.lang
 %{_libdir}/opencpn/lib%{piname}.so
 %{_datadir}/opencpn/plugins/%{piname}/data/*
-

Actions: View | Diff

Attachments on bug 28975: 12725 | 12726 | 12727 | 12728 | 12729 | 12730 | 12731 | 12732 | 12733 | 12734 | 12735 | 12736 | 12737 | 12738 | 12739 | 12740 | 12741 | 12742 | 12743 | 12744 | 12745 | 12746 | 12747 | 12748 | 12775 | 12776 | 12778 | 12779 | 12780 | 12781 | 12782 | 12783 | 12784 | 12785 | 12786 | 12787 | 12788 | 12789 | 12790 | 12791 | 12792 | 12793 | 12794 | 12795 | 12796 | 12797 | 12798 | 12799 | 12800 | 12801 | 12804 | 12805 | 12806 | 12807 | 12808 | 12809 | 12810 | 12811 | 12812 | 12813 | 12814 | 12815 | 12816 | 12817 | 12818 | 12819