diff --git a/.gitignore b/.gitignore index 9c90773..fdd622b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libapogee2_2.2.tar.gz /libapogee-3.0.3234.tar.gz /libapogee-3.1.tar.gz /libapogee-3.2.tar.gz +/libapogee-1.9.0.tar.gz diff --git a/libapogee-format-security.patch b/libapogee-format-security.patch deleted file mode 100644 index 1fb1013..0000000 --- a/libapogee-format-security.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libapogee2-2.2/Apn.h libapogee2-2.2.format/Apn.h ---- libapogee2-2.2/Apn.h 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.format/Apn.h 2013-12-03 10:48:48.997278318 +0100 -@@ -11,7 +11,7 @@ - #ifdef APOGEE_DLL_OUTPUT - - #ifdef LINUX --#define AltaDebugOutputString(__X__) fprintf(stderr,__X__) -+#define AltaDebugOutputString(__X__) fprintf(stderr, "%s", __X__) - #else - #define AltaDebugString(__X__) OutputDebugString(__X__) - #endif diff --git a/libapogee-generate-tarball.sh b/libapogee-generate-tarball.sh index f6ecdbe..344d37c 100755 --- a/libapogee-generate-tarball.sh +++ b/libapogee-generate-tarball.sh @@ -5,15 +5,14 @@ # Fedora containing only the free library itself. NAME="libapogee" -VERSION="3.2" -ORIG=indi-$1 -NEW=$NAME-$VERSION +ORIG=indi-3rdparty-$1 +NEW=$NAME-$1 -echo "Generating clean tar for $NAME $VERSION" +echo "Generating clean tar for $NAME" echo "Unpack original tar" -tar -xzf indi-$1.tar.gz +tar -xzf $ORIG.tar.gz echo "Packing new tar for $NAME" -mv $ORIG/3rdparty/$NAME $NEW +mv $ORIG/$NAME $NEW cp -r $ORIG/cmake_modules $NEW/cmake_modules tar -cpzf $NEW.tar.gz $NEW echo "Clean up" diff --git a/libapogee-suffix.patch b/libapogee-suffix.patch deleted file mode 100644 index 9968e36..0000000 --- a/libapogee-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur libapogee2-2.2.old/CMakeLists.txt libapogee2-2.2/CMakeLists.txt ---- libapogee2-2.2.old/CMakeLists.txt 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2/CMakeLists.txt 2009-02-07 17:05:39.000000000 +0100 -@@ -114,7 +114,7 @@ - - target_link_libraries(apogeeu ${LIBUSB_LIBRARIES}) - --install(TARGETS apogeeu LIBRARY DESTINATION lib${LIB_POSTFIX} ) -+install(TARGETS apogeeu LIBRARY DESTINATION lib${LIB_SUFFIX} ) - - ########### libapogeeAltaE ########### - set(AltaE_SRCS -@@ -133,7 +133,7 @@ - - target_link_libraries(apogeee ${LIBUSB_LIBRARIES} ${CURL_LIBRARIES}) - --install(TARGETS apogeee LIBRARY DESTINATION lib${LIB_POSTFIX} ) -+install(TARGETS apogeee LIBRARY DESTINATION lib${LIB_SUFFIX} ) - - install( FILES libapogee.h DESTINATION ${INCLUDE_INSTALL_DIR}/libapogee COMPONENT Devel) - diff --git a/libapogee-sysio.patch b/libapogee-sysio.patch deleted file mode 100644 index f6681a1..0000000 --- a/libapogee-sysio.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -ur libapogee2-2.2/ApogeeUsb/ApogeeUsbLinux.cpp libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinux.cpp ---- libapogee2-2.2/ApogeeUsb/ApogeeUsbLinux.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinux.cpp 2009-02-13 13:17:05.000000000 +0100 -@@ -2,11 +2,11 @@ - // - - #include --#ifndef OSX -+/*#ifndef OSX - #ifndef OSXI - #include - #endif --#endif -+#endif*/ - #include - #include - #include -diff -ur libapogee2-2.2/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp ---- libapogee2-2.2/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/ApogeeUsb/ApogeeUsbLinuxForKernel.cpp 2009-02-13 13:16:08.000000000 +0100 -@@ -2,7 +2,7 @@ - // - - #include --#include -+/* #include */ - #include - #include - #include -diff -ur libapogee2-2.2/CameraIO_Linux.cpp libapogee2-2.2.new/CameraIO_Linux.cpp ---- libapogee2-2.2/CameraIO_Linux.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/CameraIO_Linux.cpp 2009-02-13 13:17:33.000000000 +0100 -@@ -7,7 +7,7 @@ - #include "stdafx.h" - #else - #include --#include -+/*#include */ - #include - #include - #include -diff -ur libapogee2-2.2/CameraIO_LinuxISA.cpp libapogee2-2.2.new/CameraIO_LinuxISA.cpp ---- libapogee2-2.2/CameraIO_LinuxISA.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/CameraIO_LinuxISA.cpp 2009-02-13 13:17:52.000000000 +0100 -@@ -7,7 +7,7 @@ - #include "stdafx.h" - #else - #include --#include -+/*#include */ - #include - #include - #include -diff -ur libapogee2-2.2/CameraIO_LinuxPCI.cpp libapogee2-2.2.new/CameraIO_LinuxPCI.cpp ---- libapogee2-2.2/CameraIO_LinuxPCI.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/CameraIO_LinuxPCI.cpp 2009-02-13 13:18:11.000000000 +0100 -@@ -7,7 +7,7 @@ - #include "stdafx.h" - #else - #include --#include -+/*#include */ - #include - #include - #include -diff -ur libapogee2-2.2/CameraIO_LinuxPPI.cpp libapogee2-2.2.new/CameraIO_LinuxPPI.cpp ---- libapogee2-2.2/CameraIO_LinuxPPI.cpp 2008-11-18 10:44:08.000000000 +0100 -+++ libapogee2-2.2.new/CameraIO_LinuxPPI.cpp 2009-02-13 13:18:27.000000000 +0100 -@@ -7,7 +7,7 @@ - #include "stdafx.h" - #else - #include --#include -+/*#include */ - #include - #include - #include diff --git a/libapogee.spec b/libapogee.spec index bd60e35..d7ea3d5 100644 --- a/libapogee.spec +++ b/libapogee.spec @@ -1,20 +1,27 @@ -%global majorver 3 +Name: libapogee -Name: libapogee -Version: 3.2 -Release: 8%{?dist} -Summary: Library for Apogee CCD Cameras +# Bump Epoch to 1 to sync Version with other indi-3rdparty stuff +Epoch: 1 +Version: 1.9.0 +Release: 1%{?dist} +Summary: Library for Apogee CCD Cameras -License: GPLv2+ and MPLv2.0 -URL: http://indilib.org +License: GPLv2+ and MPLv2.0 +URL: http://indilib.org # Tar is generated from the huge all-in-one tar from INDI -# by using ./libapogee-generate-tarball.sh 1.3.1 +# by using ./libapogee-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-c++ -BuildRequires: boost-devel cmake libusb-devel libcurl-devel systemd +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libindi) %description Apogee library is used by applications to control Apogee CCDs. @@ -37,7 +44,6 @@ sed -i 's|DESTINATION lib|DESTINATION lib${LIB_SUFFIX}|g' CMakeLists.txt %install %cmake_install -%ldconfig_scriptlets %files %license LICENSE @@ -51,6 +57,9 @@ sed -i 's|DESTINATION lib|DESTINATION lib${LIB_SUFFIX}|g' CMakeLists.txt %{_libdir}/*.so %changelog +* Fri May 14 2021 Mattia Verga - 1:1.9.0-1 +- Bump Epoch and upgrade to 1.9.0 to match libindi-3rdparty versioning + * Tue Jan 26 2021 Fedora Release Engineering - 3.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index c1e61d3..13074bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libapogee-3.2.tar.gz) = 0071df5819c5bfce1c1f3fa3548d932f82e39b1b5b703e823536995e75b9e32d683d87c2d82566a469e2399a7a64116a1e1889c37ccc135565dbcc3164588f5f +SHA512 (libapogee-1.9.0.tar.gz) = 76eb744f5a852586db26188ae2a471ca2c5589193d62e0e36c36ed50469557585a9ae65e95ed56d40f21f3471d77343e2829a232fb2b4803d6ed72469708e1dd