Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnuastro for openSUSE:Factory checked in at 2021-08-19 10:01:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuastro (Old) and /work/SRC/openSUSE:Factory/.gnuastro.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuastro" Thu Aug 19 10:01:03 2021 rev:7 rq:912852 version:0.15 Changes: -------- --- /work/SRC/openSUSE:Factory/gnuastro/gnuastro.changes 2021-06-04 00:33:30.780888721 +0200 +++ /work/SRC/openSUSE:Factory/.gnuastro.new.1899/gnuastro.changes 2021-08-19 10:02:04.283187172 +0200 @@ -1,0 +2,7 @@ +Wed Aug 18 02:39:19 UTC 2021 - Atri Bhattacharya <[email protected]> + +- Add gnuastro-cfitsio-version-format-change.patch -- accounts for + 3 number version string for CFITSIO; patch taken from upstream + commit. + +------------------------------------------------------------------- New: ---- gnuastro-cfitsio-version-format-change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuastro.spec ++++++ --- /var/tmp/diff_new_pack.Js2lDe/_old 2021-08-19 10:02:04.767186584 +0200 +++ /var/tmp/diff_new_pack.Js2lDe/_new 2021-08-19 10:02:04.771186579 +0200 @@ -27,6 +27,8 @@ Source: https://ftp.gnu.org/pub/gnu/gnuastro/%{name}-%{version}.tar.gz Source2: https://ftp.gnu.org/pub/gnu/gnuastro/%{name}-%{version}.tar.gz.sig Source3: https://akhlaghi.org/public-pgp-key.txt#/%{name}.keyring +# PATCH-FIX-UPSTREAM gnuastro-cfitsio-version-format-change.patch [email protected] -- accounts for 3 number version string for CFITSIO; patch taken from upstream commit +Patch0: gnuastro-cfitsio-version-format-change.patch BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(cfitsio) @@ -81,7 +83,7 @@ Bash command line completion support for %{name} %prep -%setup -q +%autosetup -p1 %build %configure \ ++++++ gnuastro-cfitsio-version-format-change.patch ++++++ diff --git a/lib/fits.c b/lib/fits.c index ef559759..5fe11bd6 100644 --- a/lib/fits.c +++ b/lib/fits.c @@ -2138,8 +2138,19 @@ gal_fits_key_write_version_in_ptr(gal_fits_list_key_t **keylist, char *title, /* Print 'Versions and date' title. */ gal_fits_key_write_title_in_ptr("Versions and date", fptr); - /* Set the version of CFITSIO as a string. */ - sprintf(cfitsioversion, "%-.2f", CFITSIO_VERSION); + /* Set the version of CFITSIO as a string: before version 4.0.0 of + CFITSIO, there were only two numbers in the version (for example + '3.49' and '3.48'), but from the 4th major release, there are three + numbers in the version string. The third number corresponds to a new + 'CFITSIO_MICRO' macro. So if it doesn't exist, we'll just print two + numbers, otherwise, we'll print the three. */ +#ifdef CFITSIO_MICRO + sprintf(cfitsioversion, "%d.%d.%d", CFITSIO_MAJOR, + CFITSIO_MINOR, CFITSIO_MICRO); +#else + sprintf(cfitsioversion, "%d.%d", CFITSIO_MAJOR, + CFITSIO_MINOR); +#endif /* Write all the information: */ fits_write_date(fptr, &status);
