rpms/tachyon/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tachyon-rpm.patch, 1.6, 1.7 tachyon.spec, 1.11, 1.12

Dominik Mierzejewski rathann at fedoraproject.org
Sat Feb 28 17:46:36 UTC 2009


Author: rathann

Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32133

Modified Files:
	.cvsignore sources tachyon-rpm.patch tachyon.spec 
Log Message:
* Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.1-1
- update to 0.98.1 release
- fix mixed-up summaries
- docs are now built separately



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jul 2007 22:41:23 -0000	1.3
+++ .cvsignore	28 Feb 2009 17:46:03 -0000	1.4
@@ -1 +1 @@
-tachyon20070319.tar.gz
+tachyon-0.98.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jul 2007 22:41:23 -0000	1.3
+++ sources	28 Feb 2009 17:46:03 -0000	1.4
@@ -1 +1 @@
-ef6fea54ef5222ed0b5335e2e6a76c11  tachyon20070319.tar.gz
+8f8e7b491b2517319cb4f5596c952a0b  tachyon-0.98.1.tar.gz

tachyon-rpm.patch:

Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tachyon-rpm.patch	13 Dec 2007 21:13:36 -0000	1.6
+++ tachyon-rpm.patch	28 Feb 2009 17:46:03 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
---- tachyon/unix/Make-arch.r	2007-02-13 10:00:36.000000000 +0100
-+++ tachyon/unix/Make-arch	2007-12-13 22:08:06.000000000 +0100
+--- 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
 @@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
  
  MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -10,25 +10,7 @@
  MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
  
  default:
-@@ -983,7 +983,7 @@ linux:
- 	"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
- 	"AR = ar" \
- 	"ARFLAGS = r" \
--	"STRIP = strip" \
-+	"STRIP = touch" \
- 	"RANLIB = ranlib" \
- 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
- 
-@@ -1007,7 +1007,7 @@ linux-64:
- 	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
- 	"AR = ar" \
- 	"ARFLAGS = r" \
--	"STRIP = strip" \
-+	"STRIP = touch" \
- 	"RANLIB = ranlib" \
- 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
- 
-@@ -1029,10 +1029,10 @@ linux-64-thr:
+@@ -1064,10 +1064,10 @@ linux-64-thr:
  	$(MAKE) all \
  	"ARCH = linux-64-thr" \
  	"CC = gcc" \
@@ -41,7 +23,7 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
  
-@@ -1128,10 +1128,10 @@ linux-thr:
+@@ -1163,10 +1163,10 @@ linux-thr:
  	$(MAKE) all \
  	"ARCH = linux-thr" \
  	"CC = gcc" \
@@ -54,16 +36,27 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
  
-@@ -1140,7 +1140,7 @@ linux-thr-ogl:
+@@ -1175,7 +1175,18 @@ linux-thr-ogl:
  	$(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 -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"LIBS = -L. -ltachyon $(MISCLIB) $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux AMD64/EM64T using gcc, threads, and OpenGL
++linux-64-thr-ogl:
++	$(MAKE) all \
++	"ARCH = linux-64-thr-ogl" \
++	"CC = cc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
  	"STRIP = touch" \
-@@ -1174,44 +1174,68 @@ linux-beowulf-mpi:
+@@ -1209,25 +1220,37 @@ linux-beowulf-mpi:
  linux-lam:
  	$(MAKE) all \
  	"ARCH = linux-lam" \
@@ -83,7 +76,7 @@
 +	$(MAKE) all \
 +	"ARCH = linux-lam-ogl" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
@@ -109,6 +102,11 @@
 -	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
 +	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
  
+ linux-mpi:
+ 	$(MAKE) all \
+@@ -1255,16 +1278,16 @@ linux-mpi-64:
+ 
+ 
  # Linux AMD64/EM64T using LAM MPI, with OpenGL display
 -linux-lam-64-ogl:
 +linux-64-lam-ogl:
@@ -118,7 +116,7 @@
 -	"CFLAGS = -m64 -Wall -O6 -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 -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -m64 -Wall $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
@@ -126,30 +124,10 @@
  	"RANLIB = ranlib" \
 -	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
 +	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
-+
-+# Linux AMD64/EM64T using threads with OpenGL display
-+linux-64-thr-ogl:
-+	$(MAKE) all \
-+	"ARCH = linux-64-thr-ogl" \
-+	"CC = gcc" \
-+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
-+	"AR = ar" \
-+	"ARFLAGS = r" \
-+	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
  
  # Linux x86 using LAM MPI and threads
  linux-lam-thr:
- 	$(MAKE) all \
- 	"ARCH = linux-lam-thr" \
- 	"CC = hcc" \
--	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
-+	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math $(LAMFLAGS) -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
- 	"AR = ar" \
- 	"ARFLAGS = r" \
- 	"STRIP = strip" \
-@@ -1242,6 +1266,234 @@ linux-ppc:
+@@ -1302,6 +1325,234 @@ linux-ppc:
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
  
@@ -384,7 +362,7 @@
  # Linux PPC using gcc 
  linux-ps2:
  	$(MAKE) all \
-@@ -1259,13 +1511,61 @@ linux-alpha:
+@@ -1319,13 +1570,61 @@ linux-alpha:
  	$(MAKE) all \
  	"ARCH = linux-alpha" \
  	"CC = gcc" \
@@ -448,8 +426,8 @@
  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:35:44.000000000 +0100
-+++ tachyon/unix/Make-config	2007-12-13 22:08:20.000000000 +0100
+--- 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
 @@ -57,7 +57,7 @@ X11LIB= -lX11
  ##########################################################################
  
@@ -513,8 +491,8 @@
  
  ##########################################################################
 diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
---- tachyon/unix/Make-opengl.r	2007-01-24 09:35:44.000000000 +0100
-+++ tachyon/unix/Make-opengl	2007-12-13 21:54:04.000000000 +0100
+--- 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


Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tachyon.spec	25 Feb 2009 18:17:06 -0000	1.11
+++ tachyon.spec	28 Feb 2009 17:46:04 -0000	1.12
@@ -12,11 +12,11 @@
 
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
-Version: 0.98
-Release: 0.8.20070319%{?dist}
+Version: 0.98.1
+Release: 1%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
-Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98/tachyon20070319.tar.gz
+Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
 Patch0: %{name}-rpm.patch
 License: BSD with advertising
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -25,6 +25,10 @@
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
+BuildRequires: latex2html
+BuildRequires: %{_bindir}/dvips
+BuildRequires: %{_bindir}/latex
+BuildRequires: %{_bindir}/pdflatex
 
 %description
 A portable, high performance parallel ray tracing system supporting MPI
@@ -36,7 +40,7 @@
 This package contains pthread build.
 
 %package gl
-Summary: Parallel / Multiprocessor Ray Tracing System
+Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
 Group: Applications/Engineering
 Provides: %{name} = %{version}-%{release}
 
@@ -50,7 +54,7 @@
 This package contains pthread build with OpenGL display.
 
 %package lam
-Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
+Summary: Parallel / Multiprocessor Ray Tracing System
 Group: Applications/Engineering
 Provides: %{name} = %{version}-%{release}
 
@@ -89,11 +93,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .r
-find . -name CVS | xargs %{__rm} -rf
-chmod 644 src/hash.*
+find . -name CVS | xargs %{__rm} -r
+# executable sources
+chmod 644 src/hash.{c,h}
 chmod 644 demosrc/trackball.c
-chmod 644 scenes/imaps/*
-%{__rm} docs/tachyon/images.idx
+# pre-built binaries
+rm -r compile/{linux,solaris}/*
+# dangling symlinks
+rm scenes/{imaps,tpoly,vol}
 
 %build
 . /etc/profile.d/modules.sh
@@ -104,6 +111,10 @@
 done
 popd
 
+pushd docs
+%{__make} html pdf ps
+popd
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
@@ -143,6 +154,11 @@
 %{_datadir}/tachyon
 
 %changelog
+* Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.1-1
+- update to 0.98.1 release
+- fix mixed-up summaries
+- docs are now built separately
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98-0.8.20070319
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list