rpms/xtide/F-7 .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 xtide-README.fedora, 1.2, 1.3 xtide-get_harmonics-data.sh, 1.1, 1.2 xtide.spec, 1.31, 1.32

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23773/F-7

Modified Files:
	.cvsignore sources xtide-README.fedora 
	xtide-get_harmonics-data.sh xtide.spec 
Log Message:
* Fri Nov 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-3
- Update harmonics data to 20071122.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	5 Sep 2007 11:08:46 -0000	1.22
+++ .cvsignore	23 Nov 2007 14:31:50 -0000	1.23
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
-harmonics-dwf-20070318-dump-US.tar.bz2
+harmonics-dwf-20071122-free.tcd.bz2
 xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	5 Sep 2007 11:08:46 -0000	1.22
+++ sources	23 Nov 2007 14:31:50 -0000	1.23
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
-7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
+c86b949b347a948a8f0c3a494ebe10ae  harmonics-dwf-20071122-free.tcd.bz2
 e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide-README.fedora
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide-README.fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtide-README.fedora	30 May 2007 19:05:12 -0000	1.2
+++ xtide-README.fedora	23 Nov 2007 14:31:50 -0000	1.3
@@ -3,6 +3,8 @@
 # Written by Patrice Dumas and Mamoru Tasaka
 
 # ChangeLog:
+# 2007 Nov 23: Modified as the upstream developer
+               splitted free and non-free data
 # 2007 May 31: Modified as we now ship US part 
 #              harmonics data
 # 2006 Nov 11: Initial document created
@@ -16,19 +18,19 @@
 ================================================
 
 To use xtide and related utilities (like xttpd, 
-tideEditor), you need an harmonics file.
-However, existing files cannot be distributed as part of Fedora, 
-because their license restricts commercial redistribution and selling,
-which is too restrictive for Fedora. Currently we ship the harmonics 
-data of US part only as they are under public domain. If 
-you want to use harmonics data outside
-US, you have to install such data after the package 
-installation by yourself.
+tideEditor), you need an harmonics file. Currently 
+we ship the harmonics data of US part only, which are 
+under public domain. The harmonics data outside US 
+cannot be distributed as part of Fedora because their 
+license restricts commercial redistribution and selling,
+which is too restrictive for Fedora. If you want to 
+use harmonics data outside US, you have to install 
+such data after the package installation by yourself.
 
 Such files are available at:
 http://www.flaterco.com/xtide/files.html
 As the time of writing, the latest harmonics file is:
-ftp://ftp.flaterco.com/xtide/harmonics-dwf-20070318.tcd.bz2
+ftp://ftp.flaterco.com/xtide/harmonics-dwf-20071122-nonfree.tcd.bz2
 The utilities can only use uncompressed harmonics files.
 
 There are 2 possibilities to have the utilities become aware of


Index: xtide-get_harmonics-data.sh
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide-get_harmonics-data.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtide-get_harmonics-data.sh	26 Nov 2006 13:47:22 -0000	1.1
+++ xtide-get_harmonics-data.sh	23 Nov 2007 14:31:50 -0000	1.2
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-DATE=${DATE:-20060708}
+DATE=${DATE:-20071122}
 INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}
 
-FILE=harmonics-dwf-${DATE}.tcd.bz2
+FILE=harmonics-dwf-${DATE}-nonfree.tcd.bz2
+INSTALLFILE=${FILE%.bz2}
 
 if [ "`id -u -n`" != "root" ] ; then
     echo "You must do this by root"
@@ -15,5 +16,5 @@
 
 bzip2 -d $FILE
 mkdir -p $INSTALL_DIR
-install -m 644 harmonics-dwf-${DATE}.tcd $INSTALL_DIR
-rm -f ${FILE%.bz2}
+install -m 644 $INSTALLFILE $INSTALL_DIR
+rm -f $INSTALLFILE


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xtide.spec	5 Sep 2007 11:08:46 -0000	1.31
+++ xtide.spec	23 Nov 2007 14:31:50 -0000	1.32
@@ -1,10 +1,10 @@
 %define          betatag   %{nil}
-%define          dwfdate   20070318
+%define          dwfdate   20071122
 
 Summary:         Calculate tide all over the world
 Name:            xtide
 Version:         2.9.4
-Release:         1%{?dist}
+Release:         3%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -15,8 +15,13 @@
 
 # Source41 is created by Harminics-dwf-create-regal-OK.sh in
 # Source40
-Source40:        Harminics-USpart-recreate-sh.tar.bz2
-Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
+#
+# (Updated: 2007-Nov-23) 
+# Upstream now splitted free and non-free harmonics data
+#                     
+#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
 
 License:         GPLv3+
 Group:           Applications/Engineering
@@ -32,7 +37,7 @@
 BuildRequires:   zlib-devel
 Buildrequires:   desktop-file-utils
 BuildRequires:   libtcd-devel
-BuildRequires:   tcd-utils
+#BuildRequires:   tcd-utils
 
 Requires:        wvs-data
 Requires:        xorg-x11-fonts-base
@@ -101,8 +106,13 @@
 
 # create US part tcd data
 pushd TMPDIR
+%if 0
 build_tide_db harmonics-dwf-%{dwfdate}-Fedora.tcd \
    *txt *xml
+%else
+%{__cp} -p %{SOURCE42} .
+%{__bzip2} -d *.bz2
+%endif
 popd
 
 %install
@@ -110,14 +120,17 @@
 %{__mkdir_p} $RPM_BUILD_ROOT
  
 # 1. install xtide
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} \
+   DESTDIR=$RPM_BUILD_ROOT \
+   INSTALL="%{__install} -p" \
+   install
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
 
 # xttpd treatment
 # xttpd is wrapped
-%{__sed} -e 's|20060708|%{dwfdate}|' %{SOURCE14} \
+%{__sed} -e 's|20071122|%{dwfdate}|' %{SOURCE14} \
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
@@ -250,6 +263,9 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Fri Nov 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-3
+- Update harmonics data to 20071122.
+
 * Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
 - 2.9.4
   (Relicensed: GPLv2+ -> GPLv3+)