[libindi] Plugin directory has to be arch-dependent

Sergio Pascual sergiopr at fedoraproject.org
Fri May 9 15:11:13 UTC 2014


commit cc38afae43537405cd9ce9632fc3418cb973bb4a
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri May 9 17:11:32 2014 +0200

    Plugin directory has to be arch-dependent

 libindi-mathplugin.patch |   12 ++++++++++++
 libindi.spec             |   12 ++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/libindi-mathplugin.patch b/libindi-mathplugin.patch
new file mode 100644
index 0000000..6bdba93
--- /dev/null
+++ b/libindi-mathplugin.patch
@@ -0,0 +1,12 @@
+diff -ur libindi-0.9.8/libs/indibase/alignment/CMakeLists.txt libindi-0.9.8.math/libs/indibase/alignment/CMakeLists.txt
+--- libindi-0.9.8/libs/indibase/alignment/CMakeLists.txt	2014-05-09 16:53:05.404183770 +0200
++++ libindi-0.9.8.math/libs/indibase/alignment/CMakeLists.txt	2014-05-09 16:54:31.110896117 +0200
+@@ -8,7 +8,7 @@
+ 	set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_GSL_CXX_FLAGS})
+ endif (GSL_FOUND)
+ 
+-set(INDI_MATH_PLUGINS_DIRECTORY "${DATA_INSTALL_DIR}MathPlugins/" CACHE PATH "Path to Math Plugins directory")
++set(INDI_MATH_PLUGINS_DIRECTORY "${LIB_DESTINATION}/indi/MathPlugins/" CACHE PATH "Path to Math Plugins directory")
+ 
+ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS INDI_MATH_PLUGINS_DIRECTORY="${INDI_MATH_PLUGINS_DIRECTORY}")
+ 
diff --git a/libindi.spec b/libindi.spec
index 9b02aba..1a242f1 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -3,7 +3,7 @@
 
 Name: libindi
 Version: 0.9.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -13,13 +13,12 @@ License: LGPLv2+ and GPLv2+
 URL: http://www.indilib.org
 Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
 Patch0: libindi-cmake.patch
+# https://sourceforge.net/p/indi/bugs/50/
+Patch1: libindi-mathplugin.patch
 
 BuildRequires: cmake cfitsio-devel zlib-devel libnova-devel libfli-devel
 BuildRequires: libusb-devel libjpeg-devel gsl-devel
 
-# Wrong FSF address, reported 2012-12-07
-# https://sourceforge.net/p/indi/bugs/35/
-
 %description
 INDI is a distributed control protocol designed to operate
 astronomical instrumentation. INDI is small, flexible, easy to parse,
@@ -43,6 +42,7 @@ Static library needed to develop a %{name} application
 %prep
 %setup -q -n %{name}-%{wrongversion}
 %patch0 -p1
+%patch1 -p1
 chmod -x drivers/telescope/lx200fs2.h
 chmod -x drivers/telescope/lx200fs2.cpp
 
@@ -61,6 +61,7 @@ make install DESTDIR=%{buildroot}
 %doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libdir}/indi/MathPlugins
 %{_datadir}/indi
 /lib/udev/rules.d/99-gpusb.rules
 
@@ -73,6 +74,9 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Fri May 09 2014 Sergio Pascual <sergiopr at fedoraproject.org> 0.9.8.1-3
+- Plugin directory has to be arch-dependent
+
 * Sun Apr 27 2014 Christian Dersch <chrisdersch at gmail.com> 0.9.8.1-2
 - Fix wrong upstream version
 


More information about the scm-commits mailing list