diff --git a/.gitignore b/.gitignore index 5975280..6beca83 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /indi-gphoto-1.8.1.tar.gz /indi-gphoto-1.8.5.tar.gz /indi-gphoto-1.8.6.tar.gz +/indi-gphoto-1.9.0.tar.gz diff --git a/cmake_use_compilerflags.patch b/cmake_use_compilerflags.patch deleted file mode 100644 index 7de484e..0000000 --- a/cmake_use_compilerflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- indi-gphoto-0.9.9.20141015svn1783/CMakeLists.txt 2013-12-21 04:23:39.000000000 +0200 -+++ indi-gphoto-0.9.9.20141015svn1783/CMakeLists.txt 2014-10-25 10:20:52.115443058 +0300 -@@ -3,9 +3,9 @@ PROJECT(indi_gphoto C CXX) - - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/") - --SET(CMAKE_CXX_FLAGS "-Wall" ) -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG_FITS" ) --SET(CMAKE_C_FLAGS "-Wall" ) -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) - SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG_FITS" ) - - find_package(USB REQUIRED) diff --git a/indi-gphoto.spec b/indi-gphoto.spec index 0483d95..93ff16b 100644 --- a/indi-gphoto.spec +++ b/indi-gphoto.spec @@ -1,10 +1,8 @@ -%global __cmake_in_source_build 1 - %global driver gphoto Name: indi-%{driver} -Version: 1.8.6 -Release: 3%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: INDI driver providing support for gPhoto License: LGPLv2+ @@ -12,32 +10,29 @@ URL: http://indilib.org/ # Upstream provides one big tar including nonfree BLOBs for other drivers. # Thus we have to generate a clean tar by ourself containing only # the free driver to be packaged using -# ./indi-gphoto-generate-tarball.sh 1.3.1 +# ./indi-gphoto-generate-tarball.sh %%{version} +# The main source from upstream is at +# https://github.com/indilib/indi-3rdparty/archive/refs/tags/v%%{version}.tar.gz Source0: %{name}-%{version}.tar.gz Source1: %{name}-generate-tarball.sh +BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cfitsio-devel -BuildRequires: cmake -BuildRequires: dcraw -BuildRequires: libgphoto2-devel -BuildRequires: libjpeg-devel -BuildRequires: LibRaw-devel -BuildRequires: libtiff-devel -BuildRequires: libusb-devel -BuildRequires: systemd -BuildRequires: zlib-devel -BuildRequires: libindi = %{version} -BuildRequires: libindi-devel = %{version} +BuildRequires: systemd-rpm-macros +BuildRequires: zlib-devel +BuildRequires: pkgconfig(cfitsio) +BuildRequires: pkgconfig(libgphoto2) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libindi) = %{version} +BuildRequires: pkgconfig(libraw) +BuildRequires: pkgconfig(libusb-1.0) # We have to specify this requirement as the shared libraries are part of # libindi-libs (which is what the dependency generator will find), but the # driver also requires the binary indiserver, part of libindi package. Requires: libindi = %{version} -Requires: dcraw - %description INDI driver using gPhoto to add support for many cameras to INDI. This includes many DSLR, e.g. Canon or Nikon. @@ -45,7 +40,7 @@ This includes many DSLR, e.g. Canon or Nikon. %prep %setup -q -n%{name}-%{version} -# 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 %build @@ -64,6 +59,9 @@ sed -i 's|/lib/udev/rules.d|%{_udevrulesdir}|g' CMakeLists.txt %{_udevrulesdir}/*.rules %changelog +* Fri May 14 2021 Mattia Verga - 1.9.0-1 +- new version + * Tue Feb 02 2021 Christian Dersch - 1.8.6-3 - Rebuilt for libcfitsio.so.9 diff --git a/sources b/sources index 108e18c..41164f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indi-gphoto-1.8.6.tar.gz) = 3360722be5ab92f2b631ac620d8d2d78b14574cee16b58c32fec679610f112d3b6452cba3ec0c2f3c76b2355f2e926273384cddd7aa01ec588409a66b54c9988 +SHA512 (indi-gphoto-1.9.0.tar.gz) = 2e8efa750b9dbcc62e2545a1106227d741658351652a6e239ae6e04aca3a4e89c4dbcd2a9575a045157ed5af0af33717a5f86b4a0b42ad49cf5d509d538c59b8