From febb2c7b442ee758d3a5a24df56675ee635616d3c6bf98dd9b316f696e55a70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 13 Nov 2019 21:14:46 +0000
Subject: [PATCH] Accepting request 747230 from
 home:StefanBruens:branches:science

- Fix wrong automatic pkgconfig(wcs) requires, add
  0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch
- Drop ghostscript BuildRequires, only needed for running tests
  (not done), the PDF exporter is built unconditionally. At runtime,
  the exporter uses a "gs" executable in PATH, so add a Recommends.
- Add bcond for running tests, keep it disabled by default.

OBS-URL: https://build.opensuse.org/request/show/747230
OBS-URL: https://build.opensuse.org/package/show/science/gnuastro?expand=0&rev=7
---
 ...-by-correct-name-in-gnuastro.pc-pkgc.patch | 25 +++++++++++++++++++
 gnuastro.changes                              | 10 ++++++++
 gnuastro.spec                                 | 13 ++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch

diff --git a/0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch b/0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch
new file mode 100644
index 0000000..df8775e
--- /dev/null
+++ b/0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch
@@ -0,0 +1,25 @@
+From d4679eed85b9ee70651a54930a9cd59543c088d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 10 Nov 2019 16:03:01 +0100
+Subject: [PATCH] Reference wcslib by correct name in gnuastro.pc pkgconfig
+
+Fixes https://savannah.gnu.org/bugs/index.php?57200
+---
+ lib/gnuastro.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gnuastro.pc.in b/lib/gnuastro.pc.in
+index 3223d8f..2ffef02 100644
+--- a/lib/gnuastro.pc.in
++++ b/lib/gnuastro.pc.in
+@@ -27,6 +27,6 @@ Name: Gnuastro
+ Description: GNU Astronomy Utilities
+ URL: https://www.gnu.org/software/gnuastro/
+ Version: @VERSION@
+-Requires.private: wcs cfitsio gsl
++Requires.private: wcslib cfitsio gsl
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lgnuastro @LIBS@
+-- 
+2.23.0
+
diff --git a/gnuastro.changes b/gnuastro.changes
index 0638151..b93cade 100644
--- a/gnuastro.changes
+++ b/gnuastro.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Nov 10 15:05:21 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix wrong automatic pkgconfig(wcs) requires, add
+  0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch
+- Drop ghostscript BuildRequires, only needed for running tests
+  (not done), the PDF exporter is built unconditionally. At runtime,
+  the exporter uses a "gs" executable in PATH, so add a Recommends.
+- Add bcond for running tests, keep it disabled by default.
+
 -------------------------------------------------------------------
 Sun Nov  3 16:02:38 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/gnuastro.spec b/gnuastro.spec
index 10317a6..7e6755d 100644
--- a/gnuastro.spec
+++ b/gnuastro.spec
@@ -16,6 +16,8 @@
 #
 
 
+%bcond_with     tests
+
 %define sover 8
 Name:           gnuastro
 Version:        0.10
@@ -26,7 +28,11 @@ URL:            https://www.gnu.org/software/gnuastro/
 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://savannah.gnu.org/project/memberlist-gpgkeys.php?group=gnuastro&download=1#/%{name}.keyring
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Reference-wcslib-by-correct-name-in-gnuastro.pc-pkgc.patch
+%if %{with tests}
 BuildRequires:  ghostscript_any
+%endif
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(cfitsio)
@@ -39,6 +45,7 @@ BuildRequires:  pkgconfig(wcslib)
 Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
 Recommends:     %{name}-doc
+Recommends:     ghostscript_any >= 9.10
 
 %description
 The GNU Astronomy Utilities (Gnuastro) contains various programs and
@@ -69,6 +76,7 @@ Additional documentation for the GNU Astromomy Utilities.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -82,6 +90,11 @@ make %{?_smp_mflags}
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
+%check
+%if %{with tests}
+make check
+%endif
+
 %post -n libgnuastro%{sover} -p /sbin/ldconfig
 %postun -n libgnuastro%{sover} -p /sbin/ldconfig
 %post doc