Accepting request 930746 from home:StefanBruens:branches:graphics

- Use OpenCV 4 on TW again, instead of the old OpenCV 3.
- Use system wcslib
- Cleanup previous changes:
  * cmake is just an extraneous build dependency
  * deduplicate SVG icons and other files

OBS-URL: https://build.opensuse.org/request/show/930746
OBS-URL: https://build.opensuse.org/package/show/graphics/siril?expand=0&rev=21

siril.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Nov 10 18:53:48 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Use OpenCV 4 on TW again, instead of the old OpenCV 3.
+- Use system wcslib
+- Cleanup previous changes:
+  * cmake is just an extraneous build dependency
+  * deduplicate SVG icons and other files
+
 -------------------------------------------------------------------
 Wed Nov 10 16:47:48 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
 

siril.spec

@@ -24,7 +24,7 @@ License:        GPL-3.0-only
 Group:          Productivity/Scientific/Physics
 URL:            https://www.siril.org/
 Source:         https://gitlab.com/free-astro/siril/-/archive/%{version}/siril-%{version}.tar.bz2
-BuildRequires:  cmake
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  meson
 BuildRequires:  pkgconfig
@@ -46,9 +46,14 @@ BuildRequires:  pkgconfig(libraw)
 BuildRequires:  pkgconfig(libswresample)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libtiff-4)
+%if 0%{?suse_version} < 1550
 BuildRequires:  pkgconfig(opencv)
+%else
+BuildRequires:  pkgconfig(opencv4)
+%endif
 BuildRequires:  pkgconfig(rtprocess)
 BuildRequires:  pkgconfig(shared-mime-info)
+BuildRequires:  pkgconfig(wcslib)
 
 %description
 Siril is meant to be Iris for Linux (sirI-L). It is an astronomical image
@@ -73,6 +78,8 @@ rm %{buildroot}/%{_datadir}/doc/siril/*
 install -m 0644 -D platform-specific/linux/org.free_astro.siril.desktop %{buildroot}%{_datadir}/applications/org.free_astro.siril.desktop
 install -m 0644 -D platform-specific/linux/siril.xml                    %{buildroot}%{_datadir}/mime/packages/siril.xml
 
+%fdupes %{buildroot}/%{_datadir}
+
 %files -f %{name}.lang
 %doc ChangeLog NEWS README.md AUTHORS
 %license LICENSE.md
@@ -81,7 +88,6 @@ install -m 0644 -D platform-specific/linux/siril.xml                    %{buildr
 %{_mandir}/man1/siril.1%{?ext_man}
 %{_mandir}/man1/siril-cli.1%{?ext_man}
 %{_datadir}/siril/
-%{_datadir}/siril/pixmaps/siril.svg
 %{_datadir}/metainfo/org.free_astro.siril.appdata.xml
 %{_datadir}/applications/org.free_astro.siril.desktop
 %{_datadir}/mime/packages/siril.xml