Merge branch 'rawhide' into f34

.gitignore

@@ -22,3 +22,4 @@ libindi0_0.6.tar.gz
 /libindi-1.8.1.tar.gz
 /indi-1.8.5.tar.gz
 /indi-1.8.6.tar.gz
+/indi-1.9.0.tar.gz

libindi.spec

@@ -1,8 +1,17 @@
 %global forgeurl https://github.com/indilib/indi/
 
+# Define boolean to quickly set option and dependencies for
+# building QT5 client
+%global build_qt5_client 1
+
+# Define boolean to quickly set option and dependencies for
+# unit tests
+# FIXME no unit tests are currently found
+%global build_tests 0
+
 Name: libindi
-Version: 1.8.6
-Release: 4%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 License: LGPLv2+ and GPLv2+
@@ -18,17 +27,31 @@ Patch1: %{name}-gcc11.patch
 BuildRequires: cmake
 BuildRequires: libfli-devel
 BuildRequires: libnova-devel
-BuildRequires: qt5-qtbase-devel
 BuildRequires: systemd
 
-BuildRequires: pkgconfig(fftw3)
 BuildRequires: pkgconfig(cfitsio)
+BuildRequires: pkgconfig(fftw3)
 BuildRequires: pkgconfig(libcurl)
 BuildRequires: pkgconfig(gsl)
 BuildRequires: pkgconfig(libjpeg)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: pkgconfig(zlib)
 
+%if 0%{?build_qt5_client}
+BuildRequires: pkgconfig(Qt5Network)
+%global qt5_client ON
+%else
+%global qt5_client OFF
+%endif
+
+%if 0%{?build_tests}
+BuildRequires: pkgconfig(gtest)
+BuildRequires: pkgconfig(gmock)
+%global tests ON
+%else
+%global tests OFF
+%endif
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -65,7 +88,7 @@ Static library needed to develop a %{name} application
 %forgesetup
 %patch0 -p1
 %patch1 -p1
-# For Fedora we want to put udev rules in %{_udevrulesdir}
+# For Fedora we want to put udev rules in %%{_udevrulesdir}
 sed -i 's|/lib/udev/rules.d|%{_udevrulesdir}|g' CMakeLists.txt
 chmod -x drivers/telescope/pmc8driver.h
 chmod -x drivers/telescope/pmc8driver.cpp
@@ -76,13 +99,21 @@ chmod -x drivers/telescope/pmc8driver.cpp
 # Disable LTO
 %define _lto_cflags %{nil}
 
-%cmake 
+%cmake \
+    -DINDI_BUILD_QT5_CLIENT="%{qt5_client}" \
+    -DINDI_BUILD_UNITTESTS="%{tests}"
+
 %cmake_build
 
 %install
 %cmake_install
 
-%ldconfig_scriptlets libs
+
+%check
+%if 0%{?build_tests}
+%ctest
+%endif
+
 
 %files
 %license COPYING.BSD COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE
@@ -105,6 +136,11 @@ chmod -x drivers/telescope/pmc8driver.cpp
 %{_libdir}/*.a
 
 %changelog
+* Thu May 13 2021 Mattia Verga <mattia.verga@protonmail.com> - 1.9.0-1
+- Upgrade to 1.9.0
+- Added options to build qt5 client and unit tests
+- Remove %%ldconfig_scriptlets macro
+
 * Tue Feb 02 2021 Christian Dersch <lupinix@mailbox.org> - 1.8.6-4
 - Rebuilt for libcfitsio.so.7
 

sources

@@ -1 +1 @@
-SHA512 (indi-1.8.6.tar.gz) = c966b92cd9d66dcafd26b5ff7b062c22d035367111496c84777dfed5b22403631107f43dcdc535036198d2e108689aa99e003e9ad047a0af687ad247df155850
+SHA512 (indi-1.9.0.tar.gz) = 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e