rpms/tachyon/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tachyon-rpm.patch, 1.7, 1.8 tachyon.spec, 1.13, 1.14
Dominik Mierzejewski
rathann at fedoraproject.org
Mon Sep 21 00:34:03 UTC 2009
Author: rathann
Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10824
Modified Files:
.cvsignore sources tachyon-rpm.patch tachyon.spec
Log Message:
* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-1
- update to 0.98.7 release
- simplify specfile ifdeffery and reduce patch size
- fix build with new environment-modules
- add manpage from Debian package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 28 Feb 2009 17:46:03 -0000 1.4
+++ .cvsignore 21 Sep 2009 00:33:58 -0000 1.5
@@ -1 +1,2 @@
-tachyon-0.98.1.tar.gz
+tachyon-0.98.7.tar.gz
+tachyon.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 28 Feb 2009 17:46:03 -0000 1.4
+++ sources 21 Sep 2009 00:33:59 -0000 1.5
@@ -1 +1,2 @@
-8f8e7b491b2517319cb4f5596c952a0b tachyon-0.98.1.tar.gz
+17b41c7042a2d3a75531a4979f643d15 tachyon-0.98.7.tar.gz
+491604338614814996bfe54b6ad113d4 tachyon.1
tachyon-rpm.patch:
Make-arch | 67 ++++++++++++++++++++++++++++++++++++++++--------------------
Make-config | 30 +++++++++++++++-----------
Make-opengl | 4 +--
3 files changed, 64 insertions(+), 37 deletions(-)
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tachyon-rpm.patch 28 Feb 2009 17:46:03 -0000 1.7
+++ tachyon-rpm.patch 21 Sep 2009 00:33:59 -0000 1.8
@@ -1,6 +1,6 @@
diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
---- tachyon/unix/Make-arch.r 2009-02-01 06:06:08.000000000 +0100
-+++ tachyon/unix/Make-arch 2009-02-28 16:35:29.000000000 +0100
+--- tachyon/unix/Make-arch.r 2009-04-21 23:19:45.000000000 +0200
++++ tachyon/unix/Make-arch 2009-09-20 23:34:13.000000000 +0200
@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -14,7 +14,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
"ARCH = linux-64-thr" \
"CC = gcc" \
-- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -27,7 +27,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
"ARCH = linux-thr" \
"CC = gcc" \
-- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -40,7 +40,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
-- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
@@ -52,7 +52,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
+ $(MAKE) all \
+ "ARCH = linux-64-thr-ogl" \
+ "CC = cc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -DLP64 -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
@@ -61,14 +61,15 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
"ARCH = linux-lam" \
- "CC = hcc" \
-- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
@@ -80,8 +81,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
@@ -90,7 +90,7 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
- "ARCH = linux-lam-64" \
- "CC = hcc" \
-- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+ "ARCH = linux-64-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
@@ -113,10 +113,10 @@ diff -up tachyon/unix/Make-arch.r tachyo
$(MAKE) all \
- "ARCH = linux-lam-64-ogl" \
- "CC = hcc" \
-- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "ARCH = linux-64-lam-ogl" \
+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
@@ -127,307 +127,9 @@ diff -up tachyon/unix/Make-arch.r tachyo
# Linux x86 using LAM MPI and threads
linux-lam-thr:
-@@ -1302,6 +1325,234 @@ linux-ppc:
- "RANLIB = ranlib" \
- "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-
-+# Linux PPC using gcc and threads
-+linux-ppc-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC using threads with OpenGL display
-+linux-ppc-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC using LAM MPI
-+linux-ppc-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC using LAM MPI, with OpenGL display
-+linux-ppc-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC64 using gcc
-+linux-ppc64:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc64" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = strip" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux PPC64 using gcc and threads
-+linux-ppc64-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc64-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC64 using threads with OpenGL display
-+linux-ppc64-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc64-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux PPC64 using LAM MPI
-+linux-ppc64-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc64-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux PPC64 using LAM MPI, with OpenGL display
-+linux-ppc64-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-ppc64-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC using gcc
-+linux-sparc:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = strip" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux SPARC using gcc and threads
-+linux-sparc-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC using threads with OpenGL display
-+linux-sparc-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC using LAM MPI
-+linux-sparc-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC using LAM MPI, with OpenGL display
-+linux-sparc-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using gcc
-+linux-sparc64:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc64" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = strip" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using gcc and threads
-+linux-sparc64-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc64-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC64 using threads with OpenGL display
-+linux-sparc64-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc64-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux SPARC64 using LAM MPI
-+linux-sparc64-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc64-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux SPARC64 using LAM MPI, with OpenGL display
-+linux-sparc64-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-sparc64-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
- # Linux PPC using gcc
- linux-ps2:
- $(MAKE) all \
-@@ -1319,13 +1570,61 @@ linux-alpha:
- $(MAKE) all \
- "ARCH = linux-alpha" \
- "CC = gcc" \
-- "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
-+ "CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \
- "AR = ar" \
- "ARFLAGS = r" \
- "STRIP = strip" \
- "RANLIB = ranlib" \
- "LIBS = -L. -ltachyon $(MISCLIB) -lm"
-
-+# Linux Alpha using gcc and threads
-+linux-alpha-thr:
-+ $(MAKE) all \
-+ "ARCH = linux-alpha-thr" \
-+ "CC = gcc" \
-+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+
-+# Linux Alpha using threads with OpenGL display
-+linux-alpha-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-alpha-thr-ogl" \
-+ "CC = gcc" \
-+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux Alpha using LAM MPI
-+linux-alpha-lam:
-+ $(MAKE) all \
-+ "ARCH = linux-alpha-lam" \
-+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
-+
-+# Linux Alpha using LAM MPI, with OpenGL display
-+linux-alpha-lam-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-alpha-lam-ogl" \
-+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
-+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
- # Linux Alpha using Compaq's compilers
- linux-alpha-ccc:
- $(MAKE) all \
diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
---- tachyon/unix/Make-config.r 2007-01-24 09:15:44.000000000 +0100
-+++ tachyon/unix/Make-config 2009-02-28 16:17:03.000000000 +0100
+--- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-config 2009-09-20 23:07:42.000000000 +0200
@@ -57,7 +57,7 @@ X11LIB= -lX11
##########################################################################
@@ -491,19 +193,8 @@ diff -up tachyon/unix/Make-config.r tach
##########################################################################
diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
---- tachyon/unix/Make-opengl.r 2007-01-24 09:15:44.000000000 +0100
-+++ tachyon/unix/Make-opengl 2009-02-28 16:17:03.000000000 +0100
-@@ -9,8 +9,8 @@
- #
- # Generic Mesa OpenGL / GLX include and link specs, for most platforms
- #
--MESA_GLX_INCS = -I/usr/local/include
--MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
-+MESA_GLX_INCS =
-+MESA_GLX_LIBS = -lGL -lGLU -lX11
-
-
- #
+--- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-opengl 2009-09-20 23:07:42.000000000 +0200
@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr
#
# Linux OpenGL / GLX include and link specs
Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tachyon.spec 27 Jul 2009 05:28:52 -0000 1.13
+++ tachyon.spec 21 Sep 2009 00:33:59 -0000 1.14
@@ -1,22 +1,22 @@
-%ifarch %{ix86}
+%ifarch %{ix86} alpha ppc sparc
%define target linux
%endif
-%ifarch x86_64
+%ifarch ppc64 sparc64 x86_64
%define target linux-64
%endif
-%ifarch ppc ppc64 sparc sparc64 alpha
-%define target linux-%{_target_cpu}
-%endif
-%define variants thr thr-ogl lam lam-ogl
+%define variants thr thr-ogl
+%define mpi_variants lam lam-ogl
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
-Version: 0.98.1
-Release: 2%{?dist}
+Version: 0.98.7
+Release: 1%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
-Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
+Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
+# taken from Debian package
+Source1: %{name}.1
Patch0: %{name}-rpm.patch
License: BSD with advertising
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -96,19 +96,21 @@ with tachyon.
find . -name CVS | xargs %{__rm} -r
# executable sources
chmod 644 src/hash.{c,h}
-chmod 644 demosrc/trackball.c
-# pre-built binaries
-rm -r compile/{linux,solaris}/*
-# dangling symlinks
-rm scenes/{imaps,tpoly,vol}
+chmod 644 src/pngfile.h
+chmod 644 demosrc/spaceball.c
+chmod 644 demosrc/trackball.{c,h}
+chmod 644 scenes/imaps/*
%build
-. /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
pushd unix
for variant in %{variants} ; do
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
done
+source /etc/profile.d/modules.sh
+module load lam-%{_arch}
+for variant in %{mpi_variants} ; do
+ %{__make} %{?_smp_mflags} OPTFLAGS="$CFLAGS $RPM_OPT_FLAGS" %{target}-$variant
+done
popd
pushd docs
@@ -117,43 +119,51 @@ popd
%install
%{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
-for variant in %{variants} ; do
+mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon,%{_mandir}/man1}
+for variant in %{variants} %{mpi_variants} ; do
install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
done
rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
%{__mv} docs/tachyon docs/html
%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
+install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
%files gl
%defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
%attr(755,root,root) %{_bindir}/%{name}-ogl
%files lam
%defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam
%files lam-gl
%defattr(644,root,root,755)
-%doc Changes Copyright README
+%doc Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam-ogl
%files docs
%defattr(644,root,root,755)
-%doc docs/tachyon.pdf docs/tachyon.ps docs/html
+%doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html
%{_datadir}/tachyon
%changelog
+* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-1
+- update to 0.98.7 release
+- simplify specfile ifdeffery and reduce patch size
+- fix build with new environment-modules
+- add manpage from Debian package
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list