rpms/funtools/F-12 funtools.spec,1.16,1.17 sources,1.5,1.6

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2472

Modified Files:
	funtools.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
- New upstream source



Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/F-12/funtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- funtools.spec	24 Jul 2009 23:17:43 -0000	1.16
+++ funtools.spec	23 Dec 2009 11:59:15 -0000	1.17
@@ -2,17 +2,14 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: funtools
-Version: 1.4.0
-Release: 11%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: FITS library and utilities
 
-# Upstream version
-%define upversion 1.4.0
-
 Group: Applications/Engineering
 License: LGPLv2+
 URL: http://hea-www.harvard.edu/RD/funtools/
-Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz
+Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{version}.tar.gz
 Patch0: funtools-makefile.patch
 Patch1: funtools-wcs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -46,8 +43,6 @@ Summary: A general purpose FITS library
 Group: System Environment/Libraries
 Obsoletes: funtools < 1.4.0-2
 %description libs
-qfits is a stand-alone C library offering easy access to FITS (Flexible Image
- Transport System) files.
 This package contains the %{name} run-time library
 
 %package tcl
@@ -59,7 +54,7 @@ Provides: tcl-funtools = %{version}-%{re
 This package contains the %{name} TCL interface
 
 %prep
-%setup -q -n %{name}-%{upversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -67,24 +62,24 @@ This package contains the %{name} TCL in
 %configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \
         --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl
 # Parallel build does not work currently
-%{__make} EXTRA_LIBS="-lwcs -lz -ldl"
-%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
+make EXTRA_LIBS="-lwcs -lz -ldl"
+make shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
 mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools
 mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools
 # Bug #329741
-%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
+install -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
 # Tcl
-%{__mkdir_p} %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__cp} -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
+mkdir -p %{buildroot}%{tcl_sitearch}/tclfuntools
+cp -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
+mv %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
 
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -105,6 +100,7 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %files tcl
 %defattr(-,root,root,-)
 %{tcl_sitearch}/tclfuntools
+%{_mandir}/mann/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -115,19 +111,21 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %exclude %{_libdir}/*.a
 %{_includedir}/*
 %{_mandir}/man3/*
-%{_mandir}/mann/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
+* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
 - Catching up the soname revertion in wcstools-devel
 
-* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
+* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
 - Using wcstools-devel instead of libwcs-devel
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.0-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Aug 2007 14:01:09 -0000	1.5
+++ sources	23 Dec 2009 11:59:16 -0000	1.6
@@ -1 +1 @@
-8079d723e1424141c3f2bc4ea9b323db  funtools-1.4.0.tar.gz
+d717724bd530463ff154042a85015cf4  funtools-1.4.4.tar.gz