rpms/geomview/devel geomview-1.8.2-maxd.patch, NONE, 1.1 geomview.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23112

Modified Files:
	geomview.spec 
Added Files:
	geomview-1.8.2-maxd.patch 
Log Message:
* Fri Jul 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.9.rc3
- patch to fix ppc build


geomview-1.8.2-maxd.patch:

--- NEW FILE geomview-1.8.2-maxd.patch ---
--- geomview-1.8.2-rc3/src/lib/oogl/util/futil.c.maxd	2006-07-15 22:41:14.000000000 -0500
+++ geomview-1.8.2-rc3/src/lib/oogl/util/futil.c	2006-07-21 12:28:07.000000000 -0500
@@ -272,7 +272,7 @@
   if(binary) {
 #if WORDS_BIGENDIAN
     /* Easy -- our native floating point == big-endian IEEE */
-    return fread((char *)dv, sizeof(double), maxf, f);
+    return fread((char *)dv, sizeof(double), maxd, f);
 #else /* not native big-endian IEEE */
     union {
       int    wi[2];


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geomview.spec	21 Jul 2006 15:17:14 -0000	1.14
+++ geomview.spec	21 Jul 2006 17:32:15 -0000	1.15
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -26,15 +26,17 @@
 
 # Other plugins
 %define orrery_ver 0.9.3
-Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+Source100: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
 %define maniview_ver 2.0.0
-Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
+Source200: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
 
 ## Patches
 # put moduledir and data in sane locations
 Patch1: geomview-1.8.2-fhs.patch
+# fix typo maxf -> maxd (ppc build)
+Patch2: geomview-1.8.2-maxd.patch
 # orrery fhs fixes
-Patch2: orrery-0.9.3-fhs.patch
+Patch100: orrery-0.9.3-fhs.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
@@ -120,18 +122,19 @@
 find . -name .cvsignore | xargs rm -f
 
 %patch1 -p1 -b .fhs
+%patch2 -p1 -b .maxd
 
-#aclocal -I m4
 #libtoolize --force
+#aclocal -I m4
 #./reconf -n
 
 %if "%{?_with_orrery:1}" == "1"
-%setup -q -T -D -n %{src_dir}/src/bin -a 10
-%patch2 -p0 -b .orrery-fhs
+%setup -q -T -D -n %{src_dir}/src/bin -a 100
+%patch100 -p0 -b .orrery-fhs
 pushd orrery-%{orrery_ver}
+libtoolize --force
 aclocal -I ../../../m4
 autoreconf -i -I ../../../m4
-libtoolize --force
 #autoheader
 #automake -a
 popd
@@ -139,13 +142,11 @@
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
-%setup -q -T -D -n %{src_dir}/src/bin -a 11
+%setup -q -T -D -n %{src_dir}/src/bin -a 200
 pushd maniview-%{maniview_ver}
+#libtoolize --force
 #aclocal -I ../../../m4
 #autoreconf -i -I ../../../m4
-#libtoolize --force
-#autoheader
-#automake -a
 popd
 %setup -T -D -n %{src_dir}
 %endif
@@ -262,6 +263,9 @@
 
 
 %changelog
+* Fri Jul 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.9.rc3
+- patch to fix ppc build
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.8.rc3
 - 1.8.2-rc3
 - --without-maniview (for now, doesn't build)