[libindi] New upstream source Submitted a bug upstream, address of FSF is incorrect in some files

Sergio Pascual sergiopr at fedoraproject.org
Fri Jul 15 14:33:09 UTC 2011


commit a462608dfee93df9aba2b62c8d120d33a616ed11
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jul 15 16:32:50 2011 +0200

    New upstream source
    Submitted a bug upstream, address of FSF is incorrect in some files

 .gitignore           |    1 +
 libindi-suffix.patch |   46 +++++++++++++++++++++++++++++++---------------
 libindi.spec         |   27 +++++++++++++--------------
 sources              |    2 +-
 4 files changed, 46 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63c4f0a..6ad71c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libindi0_0.6.tar.gz
 /libindi_0.6.2.tar.gz
+/libindi_0.8.tar.gz
diff --git a/libindi-suffix.patch b/libindi-suffix.patch
index e023353..9d8ce0d 100644
--- a/libindi-suffix.patch
+++ b/libindi-suffix.patch
@@ -1,21 +1,37 @@
-diff -ur libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new/CMakeLists.txt
---- libindi-0.6.2/CMakeLists.txt	2010-07-20 06:40:26.000000000 +0200
-+++ libindi-0.6.2.new/CMakeLists.txt	2010-07-29 12:23:34.079146062 +0200
-@@ -115,7 +115,7 @@
- ######## INDI Static Library #########
- ######################################
- add_library(indidriver STATIC ${indimain_SRCS})
--install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX})
-+install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX})
- 
- ######################################
- ######## INDI Shared Library #########
-@@ -133,7 +133,7 @@
- target_link_libraries(indi ${FLI_LIBRARIES})
- endif(FLI_FOUND)
+diff -ur libindi-0.8/CMakeLists.txt libindi-0.8.new/CMakeLists.txt
+--- libindi-0.8/CMakeLists.txt	2011-05-27 23:30:39.000000000 +0200
++++ libindi-0.8.new/CMakeLists.txt	2011-07-14 23:54:57.257981664 +0200
+@@ -145,7 +145,7 @@
+ target_link_libraries(indi ${CFITSIO_LIBRARIES})
+ endif(CFITSIO_FOUND)
  
 -install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
 +install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX})
  set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
  
+ ##################################################
+@@ -153,21 +153,21 @@
+ # To link with main() for 3rd party drivers      #
+ ##################################################
+ add_library(indimain STATIC ${indimain_SRCS})
+-install(TARGETS indimain ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indimain ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ 
+ ##################################################
+ ###### INDI Default Driver Static Library ########
+ # To link with main() and indibase classes       #
+ ##################################################
+ add_library(indidriver STATIC ${indimain_SRCS} ${indidriver_SRCS})
+-install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ 
+ ##################################################
+ ########### INDI Client Static Library ###########
+ ##################################################
+ add_library(indiclient STATIC ${indiclient_SRCS})
+ target_link_libraries(indiclient indi pthread)
+-install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ 
  #####################################
+ ########## TELESCOPE GROUP ##########
diff --git a/libindi.spec b/libindi.spec
index b4d50f9..02d185c 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -1,6 +1,6 @@
 Name: libindi
-Version: 0.6.2
-Release: 3%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -13,16 +13,16 @@ License: LGPLv2+ and GPLv2+
 # rpmlint warning libindi call exit
 # upstream bug https://sourceforge.net/tracker2/?func=detail&aid=2572863&group_id=90275&atid=593019
 
-URL: http://indi.sourceforge.net/
+# Address of FSF is incorrect
+# upstream bug https://sourceforge.net/tracker/?func=detail&aid=3367995&group_id=90275&atid=593019
+
+URL: http://www.indilib.org
 
 Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
 Patch0: libindi-suffix.patch
-# https://sourceforge.net/tracker2/?func=detail&aid=2599980&group_id=90275&atid=593019
-Patch1: libindi-cfitsio.patch
-
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cmake cfitsio-devel zlib-devel libnova-devel libfli-devel
+BuildRequires: boost-devel libusb-devel
 
 %description
 INDI is a distributed control protocol designed to operate
@@ -48,8 +48,6 @@ Static library needed to develop a %{name} application
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
-#%patch2 -p1
 
 %build
 %cmake
@@ -63,7 +61,7 @@ make install DESTDIR=%{buildroot}
 pushd %{buildroot}/%{_bindir}
 for i in indi_lx200classic indi_lx200autostar indi_lx200_16 \
     indi_lx200gps indi_lx200ap; do
-ln -s indi_lx200generic $i
+         ln -s indi_lx200generic $i
 done
 popd
 
@@ -75,23 +73,24 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB LICENSE README README.drivers README.robofocus 
+%doc AUTHORS ChangeLog COPYING.LIB LICENSE README README.drivers
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_datadir}/indi
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files static
-%defattr(-,root,root,-)
 %{_libdir}/*.a
 
 %changelog
+* Fri Jul 15 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.8-1
+- New upstream source
+- Submitted a bug upstream, address of FSF is incorrect in some files
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 65b67da..cff73ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1751815adb1787543b9eca439bf0552c  libindi_0.6.2.tar.gz
+ca2b7c56431eb5e08218929e5eb72150  libindi_0.8.tar.gz


More information about the scm-commits mailing list