2015-02-25 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* cfitsio, libnova: updated
	* kstars, libfli, libindi, ufraw: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9382 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cfitsio/cfitsio-vl.spec

@@ -1,19 +1,25 @@
 Name:           cfitsio
+Version:        3.370
+Release:        1%{?_dist_release}
 Summary:        Library for manipulating FITS data files
 Summary(ja):    FITS データファイルを処理するためのライブラリ
-Version:        3.280
-Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3280.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz
-Patch0:         cfitsio.patch
+# Unbundles zlib
-Patch1:         cfitsio-pkgconfig.patch
+Patch0:         cfitsio-zlib.patch
+# Remove soname version check
+Patch1:         cfitsio-noversioncheck.patch
+# Some rearrangements in pkg-config file
+Patch2:         cfitsio-pkgconfig.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gcc-gfortran
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -30,6 +36,7 @@ community.
 
 %package devel
 Summary: Headers required when building programs against cfitsio
+Summary(ja): cfitsio を用いるプログラムのビルドに必要なヘッダファイル
 Group:  Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -39,6 +46,7 @@ Headers required when building a program against the cfitsio library.
 
 %package static
 Summary: Static cfitsio library
+Summary(ja): cfitsio の静的ライブラリ
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 
@@ -47,30 +55,59 @@ Static cfitsio library; avoid use if possible.
 
 %package docs
 Summary: Documentation for cfitsio
-Group:  Development/Libraries
+Summary(ja): cfitsio のドキュメント
+Group:  Documentation
 BuildArch: noarch
 
 %description docs
 Stand-alone documentation for cfitsio.
 
+%package -n fpack
+Summary: FITS image compression and decompression utilities
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
+%description -n fpack
+fpack optimally compresses FITS format images and funpack restores them
+to the original state.
+
+* Integer format images are losslessly compressed using the Rice
+compression algorithm.
+    * typically 30% better compression than GZIP
+    * about 3 times faster compression speed than GZIP
+    * about the same uncompression speed as GUNZIP 
+
+* Floating-point format images are compressed with a lossy algorithm
+    * truncates the image pixel noise by a user-specified amount to
+      produce much higher compression than by lossless techniques
+    * the precision of scientific measurements in the compressed image
+      (relative to those in the original image) depends on the selected
+       amount of compression
+
 %prep
 %setup -q -n cfitsio
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+# remove bundled zlib
+# not all the files inside zlib belong to zlib
+pushd zlib
+rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \
+inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \
+zutil.c zutil.h crc32.h  inffast.h  inffixed.h 
+popd
 
 %build
-FC=f95
+%configure \
-export FC
+    --enable-reentrant \
-export CC=gcc # fixes -O*, -g
+%ifarch x86_64
-%configure
+    --enable-sse2 \
-make shared %{?_smp_mflags}
+%endif
-ln -s libcfitsio.so.0 libcfitsio.so
+    --with-bzip2
+make shared %{?_smp_mflags} 
 make fpack %{?_smp_mflags}
 make funpack %{?_smp_mflags}
-unset FC
-# 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
 make testprog
@@ -81,13 +118,17 @@ cmp -s testprog.fit testprog.std
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_includedir}/%{name}
-make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
+make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} \
+     CFITSIO_LIB=%{buildroot}%{_libdir} \
      CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install
-pushd %{buildroot}%{_libdir}
+cp -p f{,un}pack %{buildroot}%{_bindir}
-ln -s libcfitsio.so.0 libcfitsio.so
+
-popd
+chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
+chmod 755 %{buildroot}%{_bindir}/f{,un}pack
+
 
 %clean
 rm -rf %{buildroot}
@@ -98,7 +139,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README License.txt changes.txt
+%doc README License.txt docs/changes.txt
 %{_libdir}/libcfitsio.so.*
 
 %files devel
@@ -113,9 +154,19 @@ rm -rf %{buildroot}
 
 %files docs
 %defattr(-,root,root,-)
-%doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
+%doc docs/fitsio.doc docs/fitsio.pdf docs/cfitsio.doc docs/cfitsio.pdf License.txt
+
+%files -n fpack
+%defattr(-,root,root,-)
+%doc docs/fpackguide.pdf License.txt
+%{_bindir}/fpack
+%{_bindir}/funpack
 
 %changelog
+* Tue Feb 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 3.370-1
+- new upstream release
+- moved docs subpackages to Documentation Group
+
 * Sat Sep  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 3.280-1
 - new upstream release
 - added Patch1

k/kstars/kstars-vl.spec

@@ -2,7 +2,7 @@ Name: kstars
 Summary: Desktop Planetarium for KDE
 Summary(ja): KDE 向けデスクトッププラネタリウム
 Version: 4.12.5
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 License: GPLv2+
 Group: Applications/Edutainment
@@ -100,6 +100,9 @@ fi
 %doc %{_docdir}/HTML/en/kstars/
 
 %changelog
+* Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.5-3
+- rebuilt with cfitsio 3.370
+
 * Thu Jan 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.12.5-2
 - rebuild with KDE-4.14.3
 

lib/libf/libfli/libfli-vl.spec

@@ -1,9 +1,9 @@
 %define majorver 1
 
 Name: libfli
-Version: 1.7
-Release: 8%{?_dist_release}
 Summary: Library for FLI CCD Camera & Filter Wheels
+Version: 1.7
+Release: 10%{?_dist_release}
 
 Group: System Environment/Libraries
 # Code and LICENSE.LIB have different versions of the BSD license
@@ -23,6 +23,7 @@ line of CCDs and Filter wheels
 
 %package devel
 Summary: Libraries, includes, etc. used to develop an application with %{name}
+Summary(ja): %{name} を用いるアプリケーションの開発に必要なファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -69,6 +70,12 @@ rm -fr %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.7-10
+- rebuilt on current VineSeed
+
+* Mon May 21 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.7-9
+- rebuild with rpm-4.8.1-3
+
 * Sat Sep 05 2009 NAKAMURA Kenta <kenta@vinelinux.org> - 1.7-8
 - use %%cmake macro
 

lib/libi/libindi/libindi-vl.spec

@@ -3,7 +3,7 @@
 Name: libindi
 Summary: Instrument Neutral Distributed Interface
 Version: 0.8
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
@@ -88,6 +88,9 @@ rm -fr %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.8.0-2
+- rebuilt with cfitsio 3.370 and libnova 0.15.0
+
 * Sun Aug 28 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.8.0-1
 - new upstream release
 - updated Patch0

lib/libn/libnova/libnova-vl.spec

@@ -1,6 +1,7 @@
 Name:		libnova
 Summary:	Libnova is a general purpose astronomy & astrodynamics library
-Version:	0.14.0
+Summary(ja):	天文学や天文力学向け汎用ライブラリ
+Version:	0.15.0
 Release:	1%{?_dist_release}
 
 License:	LGPLv2+
@@ -10,6 +11,7 @@ URL:		http://sourceforge.net/projects/libnova/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	libtool autoconf automake
 
 %description
 Libnova is a general purpose, double precision, celestial mechanics, 
@@ -17,6 +19,7 @@ astrometry and astrodynamics library
 
 %package devel
 Summary:	Development files for libnova
+Summary(ja):	libnova の開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -27,6 +30,7 @@ Contains library and header files for libnova
 %setup -q
 
 %build
+autoreconf -vif
 %configure --disable-static
 make CFLAGS="$RPM_OPT_FLAGS"  %{?_smp_mflags}
 
@@ -44,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README AUTHORS NEWS COPYING
-%{_libdir}/libnova-0.14.so.*
+%{_libdir}/libnova-0.15.so.*
 %{_bindir}/libnovaconfig
 
 %files devel
@@ -54,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.15.0-1
+- updated to 0.15.0
+
 * Sat Aug 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.14.0-1
 - new upstream release
 

u/ufraw/ufraw-vl.spec

@@ -2,9 +2,9 @@ Summary:	Utility for digital camera raw images
 Summary(ja): 	デジタルカメラの raw イメージ用ユーティリティ
 Name:		ufraw
 Version:	0.18
-Release: 	5%{?_dist_release}
+Release: 	6%{?_dist_release}
 
-License:	GPL
+License:	GPLv2
 Group:		Applications/Graphics
 URL:		http://ufraw.sourceforge.net/
 
@@ -62,7 +62,7 @@ GIMP 用の plug-in です。
 %setup -q
 
 %build
-%configure --enable-gimp --enable-extras --with-libexif --with-exiv2 DESTDIR=$RPM_BUILD_ROOT
+%configure --with-gimp --enable-extras DESTDIR=$RPM_BUILD_ROOT
 %{__make}
 
 %install
@@ -136,6 +136,9 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 %{_libdir}/gimp/2.0/plug-ins/ufraw-gimp
 
 %changelog
+* Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.18-6
+- rebuilt with cfitsio 3.370
+
 * Wed Jan 14 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.18-5
 - rebuild with libpng-1.6.12