[packages/libindi] - updated to 1.6.2 - removed obsolete pc patch
qboosh
qboosh at pld-linux.org
Fri Dec 21 06:17:52 CET 2018
commit b18f1400bc9870e05ce9cd52291a057bfb1544ec
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Dec 21 06:22:31 2018 +0100
- updated to 1.6.2
- removed obsolete pc patch
libindi-pc.patch | 50 --------------------------------------------------
libindi.spec | 34 ++++++++++++++++++++++++++++------
2 files changed, 28 insertions(+), 56 deletions(-)
---
diff --git a/libindi.spec b/libindi.spec
index f061577..86df943 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -5,14 +5,13 @@
Summary: Instrument Neutral Distributed Interface
Summary(pl.UTF-8): Instrument Neutral Distributed Interface - interfejs do sterowania przyrządami
Name: libindi
-Version: 1.4.1
+Version: 1.6.2
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
-# Source0-md5: 9f7556239dda08b7175ec44bd5a61b71
+# Source0-md5: 56dd859175312a2f6af7b359578e9edb
Patch0: no_static_lib.patch
-Patch1: %{name}-pc.patch
URL: http://www.indilib.org/
%{?with_qt5:BuildRequires: Qt5Network-devel >= 5.0}
BuildRequires: cfitsio-devel >= 3.03
@@ -23,6 +22,7 @@ BuildRequires: gsl-devel >= 1.10
#BuildRequires: libfli-devel >= 1.7
BuildRequires: libjpeg-devel
BuildRequires: libnova-devel >= 0.12.2
+BuildRequires: libtheora-devel
BuildRequires: libusb-devel >= 1
BuildRequires: libstdc++-devel >= 6:4.3
BuildRequires: pkgconfig
@@ -97,7 +97,6 @@ Biblioteka kliencka INDI oparta o Qt5.
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p2
%build
install -d build
@@ -125,59 +124,81 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README* TODO
+%attr(755,root,root) %{_bindir}/indi_astrometry
%attr(755,root,root) %{_bindir}/indi_baader_dome
%attr(755,root,root) %{_bindir}/indi_celestron_gps
+%attr(755,root,root) %{_bindir}/indi_dmfc_focus
+%attr(755,root,root) %{_bindir}/indi_dsc_telescope
%attr(755,root,root) %{_bindir}/indi_eval
%attr(755,root,root) %{_bindir}/indi_flipflat
+%attr(755,root,root) %{_bindir}/indi_focusmaster_focus
+%attr(755,root,root) %{_bindir}/indi_gemini_focus
%attr(755,root,root) %{_bindir}/indi_getprop
%attr(755,root,root) %{_bindir}/indi_gpusb
%attr(755,root,root) %{_bindir}/indi_hitecastrodc_focus
%attr(755,root,root) %{_bindir}/indi_ieq_telescope
%attr(755,root,root) %{_bindir}/indi_imager_agent
+%attr(755,root,root) %{_bindir}/indi_integra_focus
+%attr(755,root,root) %{_bindir}/indi_ioptronHC8406
%attr(755,root,root) %{_bindir}/indi_joystick
+%attr(755,root,root) %{_bindir}/indi_lakeside_focus
%attr(755,root,root) %{_bindir}/indi_lx200_10micron
%attr(755,root,root) %{_bindir}/indi_lx200_16
%attr(755,root,root) %{_bindir}/indi_lx200_OnStep
%attr(755,root,root) %{_bindir}/indi_lx200ap
+%attr(755,root,root) %{_bindir}/indi_lx200ap_experimental
%attr(755,root,root) %{_bindir}/indi_lx200autostar
%attr(755,root,root) %{_bindir}/indi_lx200basic
%attr(755,root,root) %{_bindir}/indi_lx200classic
%attr(755,root,root) %{_bindir}/indi_lx200fs2
%attr(755,root,root) %{_bindir}/indi_lx200gemini
%attr(755,root,root) %{_bindir}/indi_lx200generic
+%attr(755,root,root) %{_bindir}/indi_lx200gotonova
%attr(755,root,root) %{_bindir}/indi_lx200gps
%attr(755,root,root) %{_bindir}/indi_lx200pulsar2
%attr(755,root,root) %{_bindir}/indi_lx200ss2000pc
%attr(755,root,root) %{_bindir}/indi_lx200zeq25
%attr(755,root,root) %{_bindir}/indi_lynx_focus
+%attr(755,root,root) %{_bindir}/indi_mbox_weather
%attr(755,root,root) %{_bindir}/indi_meta_weather
%attr(755,root,root) %{_bindir}/indi_microtouch_focus
%attr(755,root,root) %{_bindir}/indi_moonlite_focus
%attr(755,root,root) %{_bindir}/indi_nfocus
+%attr(755,root,root) %{_bindir}/indi_nightcrawler_focus
%attr(755,root,root) %{_bindir}/indi_nstep_focus
%attr(755,root,root) %{_bindir}/indi_optec_wheel
+%attr(755,root,root) %{_bindir}/indi_paramount_telescope
%attr(755,root,root) %{_bindir}/indi_perfectstar_focus
+%attr(755,root,root) %{_bindir}/indi_pyxis_rotator
%attr(755,root,root) %{_bindir}/indi_quantum_wheel
%attr(755,root,root) %{_bindir}/indi_robo_focus
%attr(755,root,root) %{_bindir}/indi_rolloff_dome
%attr(755,root,root) %{_bindir}/indi_script_dome
%attr(755,root,root) %{_bindir}/indi_script_telescope
+%attr(755,root,root) %{_bindir}/indi_sestosenso_focus
%attr(755,root,root) %{_bindir}/indi_setprop
%attr(755,root,root) %{_bindir}/indi_simulator_ccd
%attr(755,root,root) %{_bindir}/indi_simulator_dome
%attr(755,root,root) %{_bindir}/indi_simulator_focus
%attr(755,root,root) %{_bindir}/indi_simulator_gps
+%attr(755,root,root) %{_bindir}/indi_simulator_guide
+%attr(755,root,root) %{_bindir}/indi_simulator_sqm
%attr(755,root,root) %{_bindir}/indi_simulator_telescope
%attr(755,root,root) %{_bindir}/indi_simulator_wheel
-%attr(755,root,root) %{_bindir}/indi_skywatcherAPIMount
+%attr(755,root,root) %{_bindir}/indi_skycommander_telescope
+%attr(755,root,root) %{_bindir}/indi_skysafari
+%attr(755,root,root) %{_bindir}/indi_skywatcherAltAzMount
%attr(755,root,root) %{_bindir}/indi_smartfocus_focus
+%attr(755,root,root) %{_bindir}/indi_snapcap
%attr(755,root,root) %{_bindir}/indi_sqm_weather
%attr(755,root,root) %{_bindir}/indi_star2000
%attr(755,root,root) %{_bindir}/indi_steeldrive_focus
-%attr(755,root,root) %{_bindir}/indi_synscan
+%attr(755,root,root) %{_bindir}/indi_synscan_telescope
%attr(755,root,root) %{_bindir}/indi_tcfs3_focus
%attr(755,root,root) %{_bindir}/indi_tcfs_focus
%attr(755,root,root) %{_bindir}/indi_temma
+%attr(755,root,root) %{_bindir}/indi_trutech_wheel
+%attr(755,root,root) %{_bindir}/indi_usbdewpoint
%attr(755,root,root) %{_bindir}/indi_usbfocusv3_focus
%attr(755,root,root) %{_bindir}/indi_v4l2_ccd
%attr(755,root,root) %{_bindir}/indi_vantage_weather
@@ -196,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/indi/drivers.xml
%{_datadir}/indi/indi_tcfs_sk.xml
/lib/udev/rules.d/99-flipflat.rules
+/lib/udev/rules.d/99-focusmaster.rules
/lib/udev/rules.d/99-gpusb.rules
/lib/udev/rules.d/99-hitecastrodcfocuser.rules
/lib/udev/rules.d/99-perfectstar.rules
diff --git a/libindi-pc.patch b/libindi-pc.patch
deleted file mode 100644
index 87e9cd6..0000000
--- a/libindi-pc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2363105d83087e83adf86846d192e5e17cd61b19 Mon Sep 17 00:00:00 2001
-From: Jasem Mutlaq <mutlaqja at ikarustech.com>
-Date: Sun, 19 Mar 2017 11:10:37 +0300
-Subject: [PATCH] Update libindi.pc to include updated libs in 1.4.1
-
----
- libindi/CMakeLists.txt | 3 +++
- libindi/libindi.pc.cmake | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/libindi/CMakeLists.txt b/libindi/CMakeLists.txt
-index 46247a7b..18ea148d 100644
---- a/libindi/CMakeLists.txt
-+++ b/libindi/CMakeLists.txt
-@@ -48,6 +48,8 @@ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
- set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
- set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-
-+set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-+
- ##################################### Build Options ##############################################
- # Select which components to build and what options to apply
-
-@@ -318,6 +320,7 @@ set_target_properties(indidriver PROPERTIES COMPILE_FLAGS "-fPIC")
- set_target_properties(indidriver PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION} OUTPUT_NAME indidriver)
- target_link_libraries(indidriver ${LIBUSB_1_LIBRARIES} ${NOVA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CFITSIO_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY} ${JPEG_LIBRARY})
- install(TARGETS indidriver LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+set(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -lindidriver -lindiAlignmentDriver")
- endif(CYGWIN)
-
-
-diff --git a/libindi/libindi.pc.cmake b/libindi/libindi.pc.cmake
-index 39b8cdb7..8deb8420 100644
---- a/libindi/libindi.pc.cmake
-+++ b/libindi/libindi.pc.cmake
-@@ -1,12 +1,12 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
-+libdir=@PKG_CONFIG_LIBDIR@
- includedir=@INCLUDE_INSTALL_DIR@
-
- Name: libindi
- Description: Instrument Neutral Distributed Interface
- URL: http://www.indilib.org/
- Version: @CMAKE_INDI_VERSION_STRING@
--Libs: -L${libdir} -lindi
-+Libs: -L${libdir} @PKG_CONFIG_LIBS@
- Cflags: -I${includedir} -I${includedir}/libindi
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libindi.git/commitdiff/b18f1400bc9870e05ce9cd52291a057bfb1544ec
More information about the pld-cvs-commit
mailing list