rpms/xtide/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.4, 1.5 xtide-2.6.4.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	.cvsignore sources xtide.spec 
Removed Files:
	xtide-2.6.4.patch 
Log Message:
auto-import xtide-2.8-1 on branch devel from xtide-2.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:36:19 -0000	1.2
+++ .cvsignore	8 Jan 2005 06:27:05 -0000	1.3
@@ -1,2 +1,2 @@
-harmonics.tcd.gz
-xtide-2.6.4.tar.gz
+harmonics-dwf-2004-12-10-v2.tcd.gz
+xtide-2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:36:19 -0000	1.2
+++ sources	8 Jan 2005 06:27:05 -0000	1.3
@@ -1,2 +1,2 @@
-d632604083928ab97deacfab76c2d50e  harmonics.tcd.gz
-6b0d5f99586a6356dbfa498629d8f793  xtide-2.6.4.tar.gz
+cc55cdf906c9cb5e7938731391f486e0  harmonics-dwf-2004-12-10-v2.tcd.gz
+17e34e7d7fc1dcf7b564b2970f821d0e  xtide-2.8.tar.gz


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xtide.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ xtide.spec	8 Jan 2005 06:27:05 -0000	1.5
@@ -1,17 +1,16 @@
 Summary: A program for calculating tide all over the world
 Name: xtide
-Version: 2.6.4
-Release: 4
+Version: 2.8
+Release: 1
 Epoch: 0
 URL: http://www.flaterco.com/xtide/
 Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz
-Source1: ftp://harmonics.unh.edu/xtide/harmonics.tcd.gz
+Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz
 Source2: %{name}.desktop
-Patch0: %{name}-%{version}.patch
+#Patch0: %{name}-%{version}.patch
 License: GPL
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# BuildRequires: wget
 BuildRequires: libpng-devel
 BuildRequires: XFree86-devel
 BuildRequires: zlib-devel
@@ -58,23 +57,19 @@
 
 %prep
 %setup -q -T -b 0
-%patch -p1 -b .buildroot 
+#%patch -p1 -b .buildroot 
 cp %{SOURCE1} ./
 cp %{SOURCE2} ./
 
 %build
 %configure
 
-# Generates xml parsing routines.  Requires bison and flex.
-./do_xml.sh
-
 make %{?_smp_mflags}
 
-# # Get harmonics file
-# wget ftp://anonymous:$USER%40$HOSTNAME@harmonics.unh.edu/xtide/harmonics.tcd.gz
-
 # Unzip harmonics file
-gunzip harmonics.tcd.gz
+gunzip harmonics-dwf-2004-12-10-v2.tcd.gz
+
+echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,11 +78,11 @@
 
 # Install harmonics file.
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-cp harmonics.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/
+install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/
 
 # Add configuration file
 mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}
-echo "%{_datadir}/%{name}/harmonics.tcd" > ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
+install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
 
 # Add desktop entry
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -112,7 +107,7 @@
 %dir %{_datadir}/%{name}
 
 # TCD file
-%config(missingok) %{_datadir}/%{name}/harmonics.tcd
+%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd
 
 # Config file
 %config(noreplace) %{_sysconfdir}/*
@@ -125,6 +120,11 @@
 %{_sbindir}/*
 
 %changelog
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-1
+- Updated to version 2.8
+- Cleaned up spec file because much of the tricks to get it to work 
+  are no longer necessary.
+
 * Mon Dec  8 2003 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.6.4-0.fdr.4
 - Removed 644 permissions.
 


--- xtide-2.6.4.patch DELETED ---