rpms/xtide/devel xtide-2.8.for_x86_64.patch, NONE, 1.1 xtide.spec, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	xtide.spec 
Added Files:
	xtide-2.8.for_x86_64.patch 
Log Message:
auto-import xtide-2.8-2 on branch devel from xtide-2.8-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: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xtide.spec	8 Jan 2005 06:27:05 -0000	1.5
+++ xtide.spec	8 Jan 2005 23:07:00 -0000	1.6
@@ -1,13 +1,13 @@
 Summary: A program for calculating tide all over the world
 Name: xtide
 Version: 2.8
-Release: 1
+Release: 2
 Epoch: 0
 URL: http://www.flaterco.com/xtide/
 Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.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)
@@ -57,7 +57,11 @@
 
 %prep
 %setup -q -T -b 0
-#%patch -p1 -b .buildroot 
+
+%ifarch x86_64
+%patch0 -p1 -b .buildroot
+%endif
+
 cp %{SOURCE1} ./
 cp %{SOURCE2} ./
 
@@ -120,6 +124,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Dec 17 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-2
+- 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-1
 - Updated to version 2.8
 - Cleaned up spec file because much of the tricks to get it to work