- New upstream source (bz #618776)
- Bz #564842 fixed upstream, patch removed - With pkgconfig file
This commit is contained in:
parent
1e72af74bb
commit
705e035628
|
@ -1 +1,2 @@
|
||||||
libindi0_0.6.tar.gz
|
libindi0_0.6.tar.gz
|
||||||
|
/libindi_0.6.2.tar.gz
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
|
diff -ur libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new/CMakeLists.txt
|
||||||
--- libindi0-0.6/CMakeLists.txt 2009-02-14 17:11:38.000000000 +0100
|
--- libindi-0.6.2/CMakeLists.txt 2010-07-29 12:26:03.996058345 +0200
|
||||||
+++ libindi0-0.6.new/CMakeLists.txt 2009-02-14 17:14:04.000000000 +0100
|
+++ libindi-0.6.2.new/CMakeLists.txt 2010-07-29 12:31:02.808099234 +0200
|
||||||
@@ -15,13 +15,14 @@
|
@@ -29,6 +29,7 @@
|
||||||
include (MacroLogFeature)
|
include (MacroLogFeature)
|
||||||
include (MacroBoolTo01)
|
include (MacroBoolTo01)
|
||||||
include (CheckIncludeFiles)
|
include (CheckIncludeFiles)
|
||||||
|
@ -9,15 +9,15 @@ diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
|
||||||
|
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
|
|
||||||
macro_optional_find_package(USB)
|
@@ -36,6 +37,7 @@
|
||||||
macro_log_feature(LIBUSB_FOUND "libusb" "User level access to USB devices" "http://indi.sf.net" FALSE "" "Provides support for USB based drivers in INDI.")
|
macro_log_feature(LIBUSB_FOUND "libusb" "User level access to USB devices" "http://indi.sf.net" FALSE "" "Provides support for USB based drivers in INDI.")
|
||||||
|
|
||||||
-macro_optional_find_package(CFITSIO)
|
macro_optional_find_package(CFITSIO)
|
||||||
+pkg_check_modules(CFITSIO REQUIRED cfitsio)
|
+pkg_check_modules(CFITSIO REQUIRED cfitsio)
|
||||||
macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H)
|
|
||||||
macro_log_feature(CFITSIO_FOUND "libcfitsio" "A library for reading and writing data files in FITS (Flexible Image Transport System) data format" "http://indi.sf.net" FALSE "3.03" "Provides INDI with FITS I/O support.")
|
|
||||||
|
|
||||||
@@ -45,7 +46,7 @@
|
if (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3)
|
||||||
|
message(FATAL_ERROR "CFITSIO version too old, Please install cfitsio 3.x and try again. http://indi.sf.net")
|
||||||
|
@@ -64,7 +66,7 @@
|
||||||
include_directories( ${CMAKE_SOURCE_DIR}/libs/webcam)
|
include_directories( ${CMAKE_SOURCE_DIR}/libs/webcam)
|
||||||
|
|
||||||
if (CFITSIO_FOUND)
|
if (CFITSIO_FOUND)
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
|
|
||||||
--- libindi0-0.6/CMakeLists.txt 2010-02-17 15:27:52.000000000 +0100
|
|
||||||
+++ libindi0-0.6.new/CMakeLists.txt 2010-02-17 15:28:28.000000000 +0100
|
|
||||||
@@ -379,7 +379,7 @@
|
|
||||||
|
|
||||||
add_executable(indi_sbig_stv ${stv_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
|
|
||||||
|
|
||||||
-target_link_libraries(indi_sbig_stv z ${NOVA_LIBRARIES} ${CFITSIO_LIBRARIES})
|
|
||||||
+target_link_libraries(indi_sbig_stv m z ${NOVA_LIBRARIES} ${CFITSIO_LIBRARIES})
|
|
||||||
|
|
||||||
install(TARGETS indi_sbig_stv RUNTIME DESTINATION bin )
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
|
diff -ur libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new/CMakeLists.txt
|
||||||
--- libindi0-0.6/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100
|
--- libindi-0.6.2/CMakeLists.txt 2010-07-20 06:40:26.000000000 +0200
|
||||||
+++ libindi0-0.6.new/CMakeLists.txt 2009-02-06 15:44:59.000000000 +0100
|
+++ libindi-0.6.2.new/CMakeLists.txt 2010-07-29 12:23:34.079146062 +0200
|
||||||
@@ -96,7 +96,7 @@
|
@@ -115,7 +115,7 @@
|
||||||
######## INDI Static Library #########
|
######## INDI Static Library #########
|
||||||
######################################
|
######################################
|
||||||
add_library(indidriver STATIC ${indimain_SRCS})
|
add_library(indidriver STATIC ${indimain_SRCS})
|
||||||
|
@ -10,19 +10,12 @@ diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
|
||||||
|
|
||||||
######################################
|
######################################
|
||||||
######## INDI Shared Library #########
|
######## INDI Shared Library #########
|
||||||
@@ -114,7 +114,7 @@
|
@@ -133,7 +133,7 @@
|
||||||
target_link_libraries(indi ${FLI_LIBRARIES})
|
target_link_libraries(indi ${FLI_LIBRARIES})
|
||||||
endif(FLI_FOUND)
|
endif(FLI_FOUND)
|
||||||
|
|
||||||
-install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
|
-install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
|
||||||
+install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX})
|
+install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX})
|
||||||
set_target_properties(indi PROPERTIES VERSION ${INDI_VERSION} SOVERSION ${INDI_SOVERSION})
|
set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
@@ -521,4 +521,4 @@
|
|
||||||
|
|
||||||
install( FILES indiapi.h indidevapi.h base64.h eventloop.h ${CMAKE_SOURCE_DIR}/libs/lilxml.h
|
|
||||||
${CMAKE_SOURCE_DIR}/libs/indicom.h DESTINATION ${INCLUDE_INSTALL_DIR}/libindi COMPONENT Devel)
|
|
||||||
-
|
|
||||||
\ No hay ningún carácter de nueva línea al final del fichero
|
|
||||||
+
|
|
||||||
|
|
20
libindi.spec
20
libindi.spec
|
@ -1,6 +1,6 @@
|
||||||
Name: libindi
|
Name: libindi
|
||||||
Version: 0.6
|
Version: 0.6.2
|
||||||
Release: 11%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Instrument Neutral Distributed Interface
|
Summary: Instrument Neutral Distributed Interface
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -15,14 +15,10 @@ License: LGPLv2+ and GPLv2+
|
||||||
|
|
||||||
URL: http://indi.sourceforge.net/
|
URL: http://indi.sourceforge.net/
|
||||||
|
|
||||||
%define majorver 0
|
Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
|
||||||
|
|
||||||
Source0: http://downloads.sourceforge.net/indi/%{name}%{majorver}_%{version}.tar.gz
|
|
||||||
Patch0: libindi-suffix.patch
|
Patch0: libindi-suffix.patch
|
||||||
# https://sourceforge.net/tracker2/?func=detail&aid=2599980&group_id=90275&atid=593019
|
# https://sourceforge.net/tracker2/?func=detail&aid=2599980&group_id=90275&atid=593019
|
||||||
Patch1: libindi-cfitsio.patch
|
Patch1: libindi-cfitsio.patch
|
||||||
# https://sourceforge.net/tracker/?func=detail&aid=2953556&group_id=90275&atid=593019
|
|
||||||
Patch2: libindi-dso.patch
|
|
||||||
|
|
||||||
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
|
@ -50,10 +46,10 @@ Requires: %{name} = %{version}-%{release}
|
||||||
Static library needed to develop a %{name} application
|
Static library needed to develop a %{name} application
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}%{majorver}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
#%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake
|
%cmake
|
||||||
|
@ -81,12 +77,18 @@ rm -rf %{buildroot}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 29 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6.2-1
|
||||||
|
- New upstream source (bz #618776)
|
||||||
|
- Bz #564842 fixed upstream, patch removed
|
||||||
|
- With pkgconfig file
|
||||||
|
|
||||||
* Wed Feb 17 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-11
|
* Wed Feb 17 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-11
|
||||||
- Added missing -lm in indi_sbig_stv. Fixes bz #564842
|
- Added missing -lm in indi_sbig_stv. Fixes bz #564842
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue