Upgrade to 2.6.8

Remove obsolete scriptlets
Use upstream patch to disable third party camera drivers

.gitignore

@@ -1 +1,5 @@
 /phd2-2.6.4-purged.tar.xz
+/phd2-2.6.5-purged.tar.xz
+/phd2-2.6.6-purged.tar.xz
+/phd2-2.6.7-purged.tar.xz
+/phd2-2.6.8-purged.tar.xz

generate-tarball.sh

@@ -10,14 +10,16 @@ rm -rf phd2-$VERSION/extra_frameworks
 rm -rf phd2-$VERSION/thirdparty/*.zip
 rm -rf phd2-$VERSION/thirdparty/*.tar.gz
 rm -rf phd2-$VERSION/thirdparty/*.tar.bz2
-rm -rf phd2-$VERSION/thirdparty/extra_frameworks
 rm -rf phd2-$VERSION/thirdparty/frameworks
 rm -rf phd2-$VERSION/thirdparty/HID_Utilities
 rm -rf phd2-$VERSION/thirdparty/include
 rm -rf phd2-$VERSION/thirdparty/openssag
+rm -rf phd2-$VERSION/thirdparty/VidCapture
 find . -name "*.dll" -type f -delete
 find . -name "*.lib" -type f -delete
+find . -name "*.dylib" -type f -delete
 find . -name "*.a" -type f -delete
+find . -name "*.so" -type f -delete
 rm -rf phd2-$VERSION/cameras/qhyccdlibs/qhyfirmware.zip
 
 tar -cJvf phd2-$VERSION-purged.tar.xz phd2-$VERSION 

phd2.spec

@@ -1,6 +1,6 @@
 Name:           phd2
-Version:        2.6.4
-Release:        3%{?dist}
+Version:        2.6.8
+Release:        1%{?dist}
 Summary:        Telescope guiding software
 # Main program files are BSD licensed
 # Some components have different licenses:
@@ -16,18 +16,10 @@ Source0:        %{name}-%{version}-purged.tar.xz
 # Script to purge binaries and unneeded files from downloaded sources
 Source1:        generate-tarball.sh
 
-# Correct appdata files location
-# https://github.com/OpenPHDGuiding/phd2/pull/658
-Patch1:         phd2_appdata_location_change.patch
-
 # Use C++14 flag
 Patch99:        phd2_cflags.patch
 
-# We need to disable camera firmwares we removed from sources
-# This is Fedora specific and not reported upstream
-Patch100:       phd2_disable_cams.patch
-
-BuildRequires:  cmake
+BuildRequires:  cmake3
 BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix
 BuildRequires:  extra-cmake-modules
@@ -45,7 +37,7 @@ BuildRequires:  pkgconfig(libindi)
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(zlib)
 
-Recommends:     libindi
+Requires:       libindi
 
 
 %description
@@ -61,16 +53,16 @@ or spectroscopy.
 find icons -type f -print0 |xargs -0 chmod -x
 chmod -x PHD_2.0_Architecture.docx
 
-# Fix line ending
-dos2unix README-PHD2.txt
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} -DUSE_SYSTEM_CFITSIO=ON \
+%{cmake3} -DUSE_SYSTEM_CFITSIO=ON \
             -DUSE_SYSTEM_LIBUSB=ON \
             -DUSE_SYSTEM_EIGEN3=ON \
-            -DUSE_SYSTEM_GTEST=ON ..
+            -DUSE_SYSTEM_GTEST=ON \
+            -DUSE_SYSTEM_LIBINDI=ON \
+            -DOPENSOURCE_ONLY=ON ..
 
 %make_build
 
@@ -83,30 +75,14 @@ popd
 %find_lang %{name}
 
 %check
-# Tests are failing on x86 with GCC7
-# https://github.com/OpenPHDGuiding/phd2/issues/608
-%ifnarch %{ix86}
-make test -C %{_target_platform}
-%endif
+env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
 
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
 
 %files -f %{name}.lang
-%doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx
+%doc README.txt PHD_2.0_Architecture.docx
 %license LICENSE.txt
 %{_bindir}/*
 %{_datadir}/metainfo/%{name}.appdata.xml
@@ -116,6 +92,25 @@ fi
 
 
 %changelog
+* Mon May 18 2020 Mattia Verga <mattia.verga@protonmail.com> - 2.6.8-1
+- Upgrade to 2.6.8
+
+* Sat Feb 08 2020 Mattia Verga <mattia.verga@protonmail.com> - 2.6.7-1
+- Upgrade to 2.6.7
+
+* Sat Mar 30 2019 Mattia Verga <mattia.verga@protonmail.com> - 2.6.6-1
+- Upgrade to 2.6.6
+- Enable tests on i686
+
+* Mon May 07 2018 Mattia Verga <mattia.verga@email.it> - 2.6.5-1
+- Upgrade to 2.6.5
+- Remove obsolete scriptlets
+- Use upstream patch to disable third party drivers
+
+* Sat Nov 11 2017 Mattia Verga <mattia.verga@email.it> - 2.6.4-3.1
+- Change weak dependency to standard dependency for EPEL7
+- Change macros to cmake3 in EPEL
+
 * Sun Nov 05 2017 Mattia Verga <mattia.verga@email.it> - 2.6.4-3
 - Fix spurious exec bits and line endings
 - Use more macros

phd2_appdata_location_change.patch

@@ -1,12 +0,0 @@
-diff -U 3 -dHrN -- a/cmake_modules/PHD2Packaging.cmake b/cmake_modules/PHD2Packaging.cmake
---- a/cmake_modules/PHD2Packaging.cmake	2017-09-26 00:21:15.000000000 +0200
-+++ b/cmake_modules/PHD2Packaging.cmake	2017-11-02 18:18:54.455096341 +0100
-@@ -74,7 +74,7 @@
-   install(FILES ${phd_src_dir}/phd2.desktop      
-           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ )
-   install(FILES ${phd_src_dir}/phd2.appdata.xml      
--          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/ )
-+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/ )
- 
-   # Make Debian package
-   set(CPACK_GENERATOR "DEB")

phd2_disable_cams.patch

@@ -1,76 +0,0 @@
-diff -U 3 -dHrN -- a/cameras.h b/cameras.h
---- a/cameras.h	2017-09-04 23:55:17.000000000 +0200
-+++ b/cameras.h	2017-09-06 20:25:22.743663856 +0200
-@@ -109,7 +109,7 @@
- #  define QHY_CAMERA
- # endif
- # define INDI_CAMERA
--# define ZWO_ASI
-+//# define ZWO_ASI
- # define SXV
- # ifdef HAVE_SBIG_CAMERA
- #   define SBIG
-diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
---- a/thirdparty/thirdparty.cmake	2017-09-26 00:21:15.000000000 +0200
-+++ b/thirdparty/thirdparty.cmake	2017-11-02 19:04:42.283172290 +0100
-@@ -1042,35 +1042,35 @@
-     set(qhyarch "x86_32")
-   endif()
-  else()
--   message(FATAL_ERROR "unknown system architecture")
-+   message(WARNING "unknown system architecture")
-  endif()
- 
--  find_path(ZWO_INCLUDE_DIR ASICamera2.h
--    PATHS
--    ${PHD_PROJECT_ROOT_DIR}/cameras
--  )
--
--  find_library(asiCamera2
--                NAMES ASICamera2
--                PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
--  if(NOT asiCamera2)
--    message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
--  endif()
--  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
--
--  if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
--    add_definitions(-DHAVE_QHY_CAMERA=1)
-+#  find_path(ZWO_INCLUDE_DIR ASICamera2.h
-+#    PATHS
-+#    ${PHD_PROJECT_ROOT_DIR}/cameras
-+#  )
-+#
-+#  find_library(asiCamera2
-+#                NAMES ASICamera2
-+#                PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-+#  if(NOT asiCamera2)
-+#    message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-+#  endif()
-+#  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-+#
-+#  if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+#    add_definitions(-DHAVE_QHY_CAMERA=1)
- 
-     # be careful not to pick up any other qhy lib on the system
--    find_library( qhylib
--                  NAMES qhy
--                  NO_DEFAULT_PATH
--                  PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
--    if(NOT qhylib)
--      message(FATAL_ERROR "Cannot find the qhy SDK libs")
--    endif()
--    set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
--  endif()
-+#    find_library( qhylib
-+#                  NAMES qhy
-+#                  NO_DEFAULT_PATH
-+#                  PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+#    if(NOT qhylib)
-+#      message(FATAL_ERROR "Cannot find the qhy SDK libs")
-+#    endif()
-+#    set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-+#  endif()
- 
-   # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
-   remove_definitions(-DHAVE_QHY_CAMERA=1)

sources

@@ -1 +1 @@
-SHA512 (phd2-2.6.4-purged.tar.xz) = 1dedb5174d9a393cbf804a4539a38afe9fd035374cd73465bc2474180d58fdbb8b9c677b00204746de72d7d374303a17e07f8537ed71a22cafea1e889f476c86
+SHA512 (phd2-2.6.8-purged.tar.xz) = 8f57cf49972af92e7618f39352fda2d890286cca7697e7c855f9ceab108172263693ff61bb25bc4a979d3196fa1bcd5bb8c5a6886350c435246f7993772ad1e2