rpms/xtide/devel .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 xtide-get_harmonics-data.sh, 1.2, 1.3 xtide.spec, 1.40, 1.41

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644/devel

Modified Files:
	.cvsignore sources xtide-get_harmonics-data.sh xtide.spec 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
- Update harmonics data to 20081228
- Update xtide-get_harmonics-data.sh following harmonics tarball 
  format change



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Feb 2008 13:46:03 -0000	1.27
+++ .cvsignore	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-Harminics-USpart-recreate-sh.tar.bz2
-harmonics-dwf-20071228-free.tcd.bz2
 xtide-2.10.tar.bz2
+harmonics-dwf-20081228-free.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Feb 2008 13:46:03 -0000	1.27
+++ sources	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
-1f9802af5a1b17491b31b6c827b56bf3  harmonics-dwf-20071228-free.tcd.bz2
 a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
+2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2


Index: xtide-get_harmonics-data.sh
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide-get_harmonics-data.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtide-get_harmonics-data.sh	23 Nov 2007 13:45:57 -0000	1.2
+++ xtide-get_harmonics-data.sh	7 Jan 2009 17:41:08 -0000	1.3
@@ -1,20 +1,27 @@
 #!/bin/sh
 
-DATE=${DATE:-20071122}
+DATE=${DATE:-20081228}
 INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}
 
-FILE=harmonics-dwf-${DATE}-nonfree.tcd.bz2
-INSTALLFILE=${FILE%.bz2}
+FILE=harmonics-dwf-${DATE}-nonfree.tar.bz2
+INSTALLFILE=${FILE%.tar.bz2}.tcd
 
 if [ "`id -u -n`" != "root" ] ; then
     echo "You must do this by root"
     exit 1
 fi
 
+TMPDIR=$(mktemp -d /tmp/xtide-XXXXXXX)
+cd $TMPDIR
+
 wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
-    ( echo ; echo "Downloading failed." ; exit 1 )
+    { echo ; echo "Downloading failed." ; exit 1 ; }
 
-bzip2 -d $FILE
-mkdir -p $INSTALL_DIR
+bzip2 -dc $FILE | tar xf -
+mkdir -p -m 0755 $INSTALL_DIR
 install -m 644 $INSTALLFILE $INSTALL_DIR
-rm -f $INSTALLFILE
+cd
+rm -f $TMPDIR/harmonics*
+rmdir $TMPDIR
+
+echo "Installed $INSTALLFILE to $INSTALL_DIR."


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xtide.spec	6 Feb 2008 18:14:50 -0000	1.40
+++ xtide.spec	7 Jan 2009 17:41:08 -0000	1.41
@@ -1,9 +1,9 @@
 %define          mainver   2.10
 %undefine          betatag
-%define          dwfdate   20071228
+%define          dwfdate   20081228
 
 
-%define          fedorarel  2
+%define          fedorarel  3
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
@@ -29,7 +29,7 @@
 #                     
 #Source40:        Harminics-USpart-recreate-sh.tar.bz2
 #Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
-Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tcd.bz2
+Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.bz2
 
 License:         GPLv3+
 Group:           Applications/Engineering
@@ -91,7 +91,8 @@
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
 
 # Dstr -> Dstr.h
 set +x
@@ -106,12 +107,6 @@
 echo
 set -x
 
-%{__mkdir} TMPDIR
-pushd TMPDIR
-%{__cp} -p %{SOURCE42} .
-%{__bzip2} -d *.bz2
-popd
-
 %build
 %configure \
    --with-xttpd-user=xttpd \
@@ -145,7 +140,7 @@
 
 # xttpd treatment
 # xttpd is wrapped
-%{__sed} -e 's|20071122|%{dwfdate}|' %{SOURCE14} \
+%{__sed} -e 's|20081228|%{dwfdate}|' %{SOURCE14} \
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
@@ -247,6 +242,7 @@
 
 %files common
 %doc README.fedora
+%doc TMPDIR/harmonics_boilerplate.txt
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %dir %{_datadir}/%{name}
@@ -280,6 +276,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
+- Update harmonics data to 20081228
+- Update xtide-get_harmonics-data.sh following harmonics tarball 
+  format change
+
 * Thu Feb  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-2
 - Use system-wide libdstr (review request 431692 passed)