Browse Source

update: libindi, libnova, cfitsio

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4722 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 12 years ago
parent
commit
9480d04bcb
3 changed files with 49 additions and 27 deletions
  1. 27 17
      c/cfitsio/cfitsio-vl.spec
  2. 12 6
      lib/libi/libindi/libindi-vl.spec
  3. 10 4
      lib/libn/libnova/libnova-vl.spec

+ 27 - 17
c/cfitsio/cfitsio-vl.spec

@@ -1,18 +1,22 @@
 Name:           cfitsio
-Version:        3.240
-Release:        2%{?_dist_release}
 Summary:        Library for manipulating FITS data files
+Summary(ja):    FITS データファイルを処理するためのライブラリ
+Version:        3.280
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
-License:        GPLv2+
+License:        MIT
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3240.tar.gz
-Patch:          cfitsio.patch
+
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3280.tar.gz
+Patch0:         cfitsio.patch
+Patch1:         cfitsio-pkgconfig.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gcc-gfortran
 
-BuildRequires:     gcc-gfortran
-Requires(post):    /sbin/ldconfig
-Requires(postun):  /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 CFITSIO is a library of C and FORTRAN subroutines for reading and writing 
@@ -25,8 +29,8 @@ most widely used FITS file programming interface in the astronomical
 community.
 
 %package devel
-Group:  Development/Libraries
 Summary: Headers required when building programs against cfitsio
+Group:  Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -34,8 +38,9 @@ Requires: pkgconfig
 Headers required when building a program against the cfitsio library.
 
 %package static
-Group: Development/Libraries
 Summary: Static cfitsio library
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
 
 %description static
 Static cfitsio library; avoid use if possible.
@@ -43,13 +48,15 @@ Static cfitsio library; avoid use if possible.
 %package docs
 Summary: Documentation for cfitsio
 Group:  Development/Libraries
+BuildArch: noarch
 
 %description docs
 Stand-alone documentation for cfitsio.
 
 %prep
 %setup -q -n cfitsio
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 FC=f95
@@ -57,13 +64,12 @@ export FC
 export CC=gcc # fixes -O*, -g
 %configure
 make shared %{?_smp_mflags}
+ln -s libcfitsio.so.0 libcfitsio.so
+make fpack %{?_smp_mflags}
+make funpack %{?_smp_mflags}
 unset FC
-# Manually fix pkgconfig .pc file (BZ 436539)
-sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new
-sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc
-rm -f cfitsio.pc.new
-# Manually correct pkgconfig .pc file version
-sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new
+# Manually fix pkgconfig .pc file (BZ 436539, BZ 618291)
+sed 's|/usr/include|/usr/include/%{name}|' cfitsio.pc >cfitsio.pc.new
 mv cfitsio.pc.new cfitsio.pc
 
 %check
@@ -110,6 +116,10 @@ rm -rf %{buildroot}
 %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
 
 %changelog
+* Sat Sep  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 3.280-1
+- new upstream release
+- added Patch1
+
 * Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 3.240-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 12 - 6
lib/libi/libindi/libindi-vl.spec

@@ -1,7 +1,9 @@
+%define majorver 0
+
 Name: libindi
 Summary: Instrument Neutral Distributed Interface
-Version: 0.6.2
-Release: 2%{?_dist_release}
+Version: 0.8
+Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
@@ -11,16 +13,15 @@ License: LGPLv2+ and GPLv2+
 # upstream bug https://sourceforge.net/tracker2/?func=detail&aid=2572902&group_id=90275&atid=593019
 URL: http://indi.sourceforge.net/
 
-%define majorver 0
-
 Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
 Patch0: libindi-suffix.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
 BuildRequires: cfitsio-devel >= 3.03
-BuildRequires: libfli-devel
+BuildRequires: libboost-devel
 BuildRequires: libnova-devel >= 0.12.1
+BuildRequires: libusb-devel
 BuildRequires: zlib-devel
 
 Conflicts: kdeedu3
@@ -73,7 +74,7 @@ rm -fr %{buildroot}
 
 %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
@@ -87,6 +88,11 @@ rm -fr %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Aug 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.8.0-1
+- new upstream release
+- updated Patch0
+- built with libnova-0.14
+
 * Thu Sep 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.6.3-1
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 10 - 4
lib/libn/libnova/libnova-vl.spec

@@ -1,11 +1,14 @@
-Summary:	Libnova is a general purpose astronomy & astrodynamics library
 Name:		libnova
-Version:	0.13.0
+Summary:	Libnova is a general purpose astronomy & astrodynamics library
+Version:	0.14.0
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+
 License:	LGPLv2+
+Group:		System Environment/Libraries
 URL:		http://sourceforge.net/projects/libnova/
+
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -41,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README AUTHORS NEWS COPYING
-%{_libdir}/libnova-0.13.so.*
+%{_libdir}/libnova-0.14.so.*
 %{_bindir}/libnovaconfig
 
 %files devel
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.14.0-1
+- new upstream release
+
 * Thu Apr 15 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.13.0-1
 - new upstream release