rpms/geomview/devel geomview-cvs-checkout.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 geomview.spec, 1.11, 1.12 sources, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore geomview.spec sources 
Added Files:
	geomview-cvs-checkout.sh 
Log Message:
* Fri Jun 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.6.cvs20060623
- geomview-cvs20060623, (hopefully) will yield a usable, x86_64 build (#182625)
- --disable-seekpipe



--- NEW FILE geomview-cvs-checkout.sh ---
#!/bin/sh


DATE=$(date +%Y%m%d)

set -x
rm -rf geomview
#cvs -d:pserver:anonymous at geomview.cvs.sourceforge.net:/cvsroot/geomview login
cvs -z3 -d:pserver:anonymous at geomview.cvs.sourceforge.net:/cvsroot/geomview co -P geomview 

tar cjf geomview-cvs${DATE}.tar.bz2 geomview

rm -rf geomview



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 May 2006 18:53:24 -0000	1.4
+++ .cvsignore	24 Jun 2006 01:46:34 -0000	1.5
@@ -2,3 +2,4 @@
 orrery-0.9.3.tar.gz
 geomview-snapshot-2004-02-21.tar.gz
 geomview.png
+geomview-cvs20060623.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geomview.spec	20 Jun 2006 18:46:27 -0000	1.11
+++ geomview.spec	24 Jun 2006 01:46:34 -0000	1.12
@@ -3,8 +3,7 @@
 %define _with_orrery --with-orrery
 %define _with_maniview --with-maniview
 
-%define beta -alpha
-%define cvs  20040221
+%define cvs  20060623
 
 Name:    geomview
 Summary: Interactive 3D viewing program
@@ -16,10 +15,12 @@
 #Url:    http://sourceforge.net/projects/geomview/
 Group:   Applications/Engineering
 #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
-Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+#Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+Source0: geomview-cvs%{cvs}.tar.bz2
+Source1: geomview-cvs-checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugzilla.redhat.com/bugzilla/182625
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 Obsoletes: %{name}-plugins < %{version}-%{release}
 Provides:  %{name}-plugins = %{version}-%{release}
@@ -39,11 +40,23 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
-BuildRequires: flex
+BuildRequires: byacc flex
 BuildRequires: openmotif-devel
 BuildRequires: xforms-devel
-## X/GL support
 BuildRequires: libGL-devel libGLU-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+%endif
+
+#BuildRequires: /usr/bin/makeinfo 
+BuildRequires: texinfo
+
+#BuildRequires: /usr/bin/texi2html
+%if "%{?fedora}" > "3"
+BuildRequires: texi2html
+%else
+BuildRequires: tetex
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -78,7 +91,6 @@
 Group:   Applications/Engineering
 Summary: Geomview module for viewing 3D manifolds
 Requires: %{name} = %{version}
-BuildRequires: xforms-devel 
 Obsoletes: maniview < %{maniview_ver}-%{release}
 Provides:  maniview = %{maniview_ver}-%{release}
 %description maniview
@@ -87,18 +99,15 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta} 
+%setup -q -n %{name} 
 
 %patch1 -p1 -b .rh
 
 libtoolize --force
-aclocal -I m4
-autoconf
-autoheader
-automake -a
+./reconf -n
 
 %if "%{?_with_orrery:1}" == "1"
-%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+%setup -q -T -D -n %{name}/src/bin -a 10
 pushd orrery-%{orrery_ver}
 libtoolize --force
 aclocal -I ../../../m4
@@ -106,11 +115,11 @@
 autoheader
 automake -a
 popd
-%setup -T -D -n %{name}-%{version}%{?beta}
+%setup -T -D -n %{name}
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
-%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+%setup -q -T -D -n %{name}/src/bin -a 11
 pushd maniview-%{maniview_ver}
 libtoolize --force
 aclocal -I ../../../m4
@@ -118,7 +127,7 @@
 autoheader
 automake -a
 popd
-%setup -T -D -n %{name}-%{version}%{?beta}
+%setup -T -D -n %{name}
 %endif
 
 
@@ -129,7 +138,8 @@
 
 # --config-cache (for maniview)
 %configure \
-  --config-cache 
+  --config-cache \
+  --disable-seekpipe
 
 # Either do (re)automake steps above for addons, or this. -- Rex
 %if 0
@@ -139,7 +149,10 @@
 %endif
 
 # not smp-safe
-make MATHLIB=-lm
+make MATHLIB=-lm || \
+  test -s src/lib/oogl/wa/wa.yacc.c || rm -f src/lib/oogl/wa/wa.yacc.c
+
+make 
 
 
 %install
@@ -245,6 +258,10 @@
 
 
 %changelog
+* Fri Jun 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.6.cvs20060623
+- geomview-cvs20060623, (hopefully) will yield a usable, x86_64 build (#182625)
+- --disable-seekpipe
+
 * Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.5.cvs20040221
 - BR: automake libtool
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 May 2006 18:53:24 -0000	1.4
+++ sources	24 Jun 2006 01:46:34 -0000	1.5
@@ -1,4 +1,4 @@
-776c3acefac602c422dacd45119f3560  geomview-snapshot-2004-02-21.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
+c6fa3ef59c73e0ffc008b38724012e68  geomview-cvs20060623.tar.bz2