rpms/xtide/F-7 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 xtide-README.fedora, 1.1, 1.2 xtide.spec, 1.28, 1.29

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	.cvsignore sources xtide-README.fedora xtide.spec 
Log Message:
* Thu May 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-2
- Ship US part tcd data, which are under public domain.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	18 Apr 2007 01:17:28 -0000	1.20
+++ .cvsignore	30 May 2007 19:05:12 -0000	1.21
@@ -1 +1,3 @@
+Harminics-USpart-recreate-sh.tar.bz2
+harmonics-dwf-20070318-dump-US.tar.bz2
 xtide-2.9.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Apr 2007 01:17:28 -0000	1.20
+++ sources	30 May 2007 19:05:12 -0000	1.21
@@ -1 +1,3 @@
+83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
+7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
 0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2


Index: xtide-README.fedora
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtide-README.fedora	26 Nov 2006 13:47:22 -0000	1.1
+++ xtide-README.fedora	30 May 2007 19:05:12 -0000	1.2
@@ -2,6 +2,11 @@
 # xtide-README.fedora
 # Written by Patrice Dumas and Mamoru Tasaka
 
+# ChangeLog:
+# 2007 May 31: Modified as we now ship US part 
+#              harmonics data
+# 2006 Nov 11: Initial document created
+
 # If you have some questions, please report it
 # with redhat bugzilla:
 # https://bugzilla.redhat.com/bugzilla/index.cgi
@@ -14,13 +19,16 @@
 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. These files should therefore 
-be installed after the package installation by yourself.
+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.
 
 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-20060708.tcd.bz2
+ftp://ftp.flaterco.com/xtide/harmonics-dwf-20070318.tcd.bz2
 The utilities can only use uncompressed harmonics files.
 
 There are 2 possibilities to have the utilities become aware of


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xtide.spec	4 May 2007 07:59:27 -0000	1.28
+++ xtide.spec	30 May 2007 19:05:12 -0000	1.29
@@ -4,7 +4,7 @@
 Summary:         Calculate tide all over the world
 Name:            xtide
 Version:         2.9.3
-Release:         1%{?dist}.1
+Release:         2%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -13,6 +13,11 @@
 Source20:        %{name}.desktop
 Source30:        xtide-README.fedora
 
+# 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
+
 License:         GPL
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +32,8 @@
 BuildRequires:   zlib-devel
 Buildrequires:   desktop-file-utils
 BuildRequires:   libtcd-devel
+BuildRequires:   tcd-utils
+
 Requires:        wvs-data
 Requires:        xtide-common
 
@@ -61,22 +68,12 @@
 algorithm -- you also need some special data for each and every
 location for which you want to predict tides.  XTide reads this data
 from harmonics files.  See http://www.flaterco.com/xtide/files.html
-for details on where to get these (note: please also see README.fedora
-in common package for Fedora specific issue.).
+for details on where to get these 
+
+NOTE:
+Please also see README.fedora in xtide-common package for Fedora 
+specific issue.
 
-Ultimately, XTide's predictions can only be as good as the available
-harmonics data.  Due to issues of data availability and of
-compatibility with non-U.S. tide systems, the predictions for
-U.S. locations tend to be a lot better on average than those for
-locations outside of the U.S.  It is up to you to verify that the
-predictions for your locale match up acceptably well with the
-officially sanctioned ones.
-
-    * Deviations of 1 minute from official predictions are typical for
-      U.S. locations having the latest data.
-    * Deviations of 20 minutes are typical for non-U.S. locations or
-      U.S. locations that are using obsolete data.
-    * Much longer deviations indicate a problem.
 
 %description common
 This package contains common files needed by xtide, xttpd and
@@ -86,6 +83,11 @@
 %prep
 %setup -q
 
+%{__mkdir} TMPDIR
+pushd TMPDIR
+%{__bzip2} -dc %{SOURCE41} | %{__tar} -xf -
+popd
+
 %build
 %configure \
    --with-xttpd-user=xttpd \
@@ -96,6 +98,12 @@
 echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
 echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
+# create US part tcd data
+pushd TMPDIR
+build_tide_db harmonics-dwf-%{dwfdate}-Fedora.tcd \
+   *txt *xml
+popd
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT
@@ -160,6 +168,10 @@
 # 1F and others
 %{__install} -c -p -m 644 %{SOURCE30} README.fedora
 
+# 1G tcd data
+%{__install} -c -p -m 644 TMPDIR/*tcd \
+   $RPM_BUILD_ROOT%{_datadir}/xtide-harmonics/
+
 # 2 Documentation
 for f in AUTHORS ChangeLog NEWS README ; do
    iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
@@ -207,6 +219,9 @@
 
 %{_sbindir}/xtide-get*.sh
 
+# Now include tcd data
+%{_datadir}/%{name}-harmonics/*.tcd
+
 %files
 %defattr(-,root,root,-)
 
@@ -229,6 +244,9 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Thu May 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-2
+- Ship US part tcd data, which are under public domain.
+
 * Wed Apr 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-1
 - 2.9.3