rpms/xtide/FC-2 xtide-2.8.for_x86_64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtide.spec, 1.3, 1.4 xtide-2.6.4.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jan 15 09:55:33 UTC 2005
Author: scop
Update of /cvs/extras/rpms/xtide/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv20279/FC-2
Modified Files:
.cvsignore sources xtide.spec
Added Files:
xtide-2.8.for_x86_64.patch
Removed Files:
xtide-2.6.4.patch
Log Message:
auto-import xtide-2.8-0.fdr.1.2 on branch FC-2 from xtide-2.8-0.fdr.1.2.src.rpm
xtide-2.8.for_x86_64.patch:
--- NEW FILE xtide-2.8.for_x86_64.patch ---
diff -Naur xtide-2.8.orig/Makefile.in xtide-2.8/Makefile.in
--- xtide-2.8.orig/Makefile.in 2004-12-17 18:21:28.000000000 -0800
+++ xtide-2.8/Makefile.in 2004-12-17 18:14:39.000000000 -0800
@@ -15,7 +15,7 @@
CXX = @CXX@
CC = @CC@
CXXFLAGS = @extracxxflags@ @DEFS@ -I at includedir@ -Ilibtcd -I$(XROOT)/include @normalcxxflags@ -c
-LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib @normalldflags@ -o
+LDFLAGS = @extraldflags@ -L at libdir@ -L$(XROOT)/lib64 @normalldflags@ -o
# Extra switches and libs determined by configure.in
extraswitches=@extraswitches@
diff -Naur xtide-2.8.orig/configure xtide-2.8/configure
--- xtide-2.8.orig/configure 2004-12-17 18:21:28.000000000 -0800
+++ xtide-2.8/configure 2004-12-17 18:23:57.000000000 -0800
@@ -2602,6 +2602,12 @@
break
fi
done
+for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do
+ if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then
+ xroot="$dir"
+ break
+ fi
+done
echo "$as_me:$LINENO: result: $xroot" >&5
echo "${ECHO_T}$xroot" >&6
if test "$xroot" = "NOT FOUND"; then
diff -Naur xtide-2.8.orig/configure.in xtide-2.8/configure.in
--- xtide-2.8.orig/configure.in 2004-12-17 18:21:28.000000000 -0800
+++ xtide-2.8/configure.in 2004-12-17 18:19:50.000000000 -0800
@@ -54,6 +54,12 @@
break
fi
done
+for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do
+ if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then
+ xroot="$dir"
+ break
+ fi
+done
AC_MSG_RESULT($xroot)
if test "$xroot" = "NOT FOUND"; then
AC_MSG_WARN(Type 'make tide' or 'make xttpd' to compile without X11.)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-2/.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 15 Jan 2005 09:55:31 -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/FC-2/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 15 Jan 2005 09:55:31 -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/FC-2/xtide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtide.spec 8 Nov 2004 05:36:44 -0000 1.3
+++ xtide.spec 15 Jan 2005 09:55:31 -0000 1.4
@@ -1,17 +1,16 @@
Summary: A program for calculating tide all over the world
Name: xtide
-Version: 2.6.4
-Release: 0.fdr.4.2
+Version: 2.8
+Release: 0.fdr.1.2
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}.for_x86_64.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,23 @@
%prep
%setup -q -T -b 0
-%patch -p1 -b .buildroot
+
+%ifarch x86_64
+%patch0 -p1 -b .buildroot
+%endif
+
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 +82,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 +111,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 +124,14 @@
%{_sbindir}/*
%changelog
+* Fri Dec 17 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-0.fdr.1
+- Made a small hack that should make it compile on x86_64 systems.
+
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-0.fdr.0
+- 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 ---
More information about the fedora-extras-commits
mailing list