Arch-excludes February 2025

arch-excludes@lists.fedoraproject.org

2 participants
234 discussions

Architecture specific change in rpms/tachyon.git
by githook-noreply＠fedoraproject.org 01 Feb '25

01 Feb '25

The package rpms/tachyon.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=85756f0361b7… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=61cfe02b22a7… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=af53181c6176… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=22bb4353b690… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=d844023fdc28… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=aa43e7f55021… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=1618436047b4… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=4b1d60db13d2… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=ce19d89eb996… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=377ce78106ac… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=d499ab86c520… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=54a0945477d2… https://src.fedoraproject.org/cgit/rpms/tachyon.git/commit/?id=9199ae589f20…. Change: +%ifarch aarch64 +%ifarch armv7hl aarch64 -%ifarch armv7hl aarch64 -%ifarch alpha %{power64} sparc64 x86_64 aarch64 +%ifarch armv7hl aarch64 +%ifarch armv7hl +%ifarch alpha ppc64 sparc64 x86_64 +%ifarch alpha ppc64 sparc64 x86_64 -%ifarch ppc ppc64 sparc sparc64 alpha +%ifarch ppc ppc64 sparc sparc64 alpha +%ifarch ppc ppc64 sparc sparc64 +%ifarch sparc +%ifarch ppc Thanks. Full change: ============ commit 85756f0361b70874856b5f9bd0b26ec12fc60ddb Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> Date: Fri Jan 17 23:15:51 2025 +0100 update to 0.99.5 - avoid using obsolete patchN macro - rebase patches and drop unused hunks - enumerate licenses and update License: tag - use package names instead of file references in BuildRequires diff --git a/.gitignore b/.gitignore index 34ab1f9..1539909 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ tachyon-0.98.7.tar.gz tachyon.1 /tachyon-0.99b2.tar.gz /tachyon-0.99b6.tar.gz +/tachyon-0.99.5.tar.gz diff --git a/sources b/sources index 11ac7eb..e32c83a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -491604338614814996bfe54b6ad113d4 tachyon.1 -9e5ed4045c472e01e57480d7c7eee849 tachyon-0.99b6.tar.gz +SHA512 (tachyon-0.99.5.tar.gz) = a7a2af36e8cd31855bb048c135145ed62c09d580b80a761a7e8ce26add2aa3665bd8a8684e8cca9bdd1230bb2b6257f9f602c72c847b0b6f2d95673bcbed51b5 diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index 1f31099..4f7a73a 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,6 +1,6 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch ---- tachyon/unix/Make-arch.r 2013-04-21 21:09:28.000000000 +0200 -+++ tachyon/unix/Make-arch 2013-08-09 00:26:25.175778876 +0200 +--- tachyon/unix/Make-arch.r 2022-04-23 09:09:58.000000000 +0200 ++++ tachyon/unix/Make-arch 2025-01-17 21:53:37.669713365 +0100 @@ -11,7 +11,7 @@ RANLIB= touch MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -10,12 +10,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -1217,10 +1217,10 @@ linux-64-thr: +@@ -1273,10 +1273,10 @@ linux-64-thr: $(MAKE) all \ "ARCH = linux-64-thr" \ - "CC = gcc" \ + "CC = cc" \ - "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -23,12 +23,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1364,10 +1364,10 @@ linux-thr: +@@ -1455,10 +1455,10 @@ linux-thr: $(MAKE) all \ "ARCH = linux-thr" \ - "CC = gcc" \ -- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ + "CC = cc" \ +- "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -36,7 +36,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1376,7 +1376,7 @@ linux-thr-ogl: +@@ -1467,7 +1467,7 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ @@ -45,7 +45,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1387,7 +1387,7 @@ linux-64-thr-ogl: +@@ -1478,7 +1478,7 @@ linux-64-thr-ogl: $(MAKE) all \ "ARCH = linux-64-thr-ogl" \ "CC = cc" \ @@ -54,81 +54,10 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1446,25 +1446,37 @@ linux-beowulf-mpi: - linux-lam: - $(MAKE) all \ - "ARCH = linux-lam" \ -- "CC = hcc" \ -- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ -+ "RANLIB = ranlib" \ -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" -+ -+# Linux x86 using LAM MPI, with OpenGL display -+linux-lam-ogl: -+ $(MAKE) all \ -+ "ARCH = linux-lam-ogl" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ -+ "AR = ar" \ -+ "ARFLAGS = r" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux AMD64/EM64T using LAM MPI --linux-lam-64: -+linux-64-lam: - $(MAKE) all \ -- "ARCH = linux-lam-64" \ -- "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ -+ "ARCH = linux-64-lam" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DLP64 $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" - - linux-mpi: - $(MAKE) all \ -@@ -1524,16 +1536,16 @@ linux-mpi-ogl: - "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux AMD64/EM64T using LAM MPI, with OpenGL display --linux-lam-64-ogl: -+linux-64-lam-ogl: - $(MAKE) all \ -- "ARCH = linux-lam-64-ogl" \ -- "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ -+ "ARCH = linux-64-lam-ogl" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux x86 using LAM MPI and threads - linux-lam-thr: diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ---- tachyon/unix/Make-config.r 2013-04-21 21:09:28.000000000 +0200 -+++ tachyon/unix/Make-config 2013-08-09 00:20:28.804492178 +0200 -@@ -105,7 +105,7 @@ THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS +--- tachyon/unix/Make-config.r 2022-04-23 08:19:13.000000000 +0200 ++++ tachyon/unix/Make-config 2025-01-17 21:49:43.843908775 +0100 +@@ -111,7 +111,7 @@ THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS - ########################################################################## # Customize MPI directories and includes as-needed. # A typical MPICH installation location: @@ -137,18 +66,7 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config MPIINC=$(MPIDIR)/include MPILIB=$(MPIDIR)/lib -@@ -125,7 +125,9 @@ MPIFLAGS=-DMPI -DUSE_MPI_IN_PLACE - # MPI 1.x flags: - #MPIFLAGS=-DMPI - -- -+# LAM -+LAMFLAGS=`pkg-config --cflags lam` -+LAMLIBS=`pkg-config --libs lam` - - ########################################################################## - # Floating point configuration: -@@ -166,14 +168,14 @@ MBOX= +@@ -201,14 +201,14 @@ MBOX= # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -169,7 +87,7 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ########################################################################## -@@ -186,14 +188,14 @@ JPEGLIB= +@@ -221,14 +221,14 @@ JPEGLIB= # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support diff --git a/tachyon-shared.patch b/tachyon-shared.patch index a5d328d..d1d68d8 100644 --- a/tachyon-shared.patch +++ b/tachyon-shared.patch @@ -1,23 +1,23 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile ---- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 -+++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200 -@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon +--- tachyon/unix/Makefile.shared 2022-04-12 08:30:07.000000000 +0200 ++++ tachyon/unix/Makefile 2025-01-17 22:03:59.254948662 +0100 +@@ -23,7 +23,7 @@ OBJDIROPTIX=${ARCHDIR}/libtachyonoptix # # Name of raytracing library file to create # -RAYLIB=${ARCHDIR}/libtachyon.a +RAYLIB=${ARCHDIR}/libtachyon.so + RAYLIBOPTIX=${ARCHDIR}/libtachyonoptix.a RAYLIBDIR=${ARCHDIR} - # -@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ +@@ -337,124 +337,126 @@ RAYOBJS= ${OBJDIR}/api.o \ ${OBJDIR}/tgafile.o \ ${OBJDIR}/winbmp.o +${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2) +${RAYLIB} : DIRNAME=tachyon-${VERSION} ${RAYLIB} : ${RAYOBJS} -- rm -f ${RAYLIB} + rm -f ${RAYLIB} - ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} - ${RANLIB} ${RAYLIB} + ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ${JPEGLIB} @@ -175,5 +175,5 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile - ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o + ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o - clean : - @echo "Cleaning object files, binaries etc." + + ## diff --git a/tachyon.spec b/tachyon.spec index ca6abeb..2c9e761 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -5,28 +5,37 @@ %endif %define variants thr thr-ogl -%define beta b6 +%define beta %nil Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon -Version: 0.99 -Release: 0.31.%{beta}%{?dist} +Version: 0.99.5 +Release: 1%{?beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package Source1: %{name}.1 Patch0: %{name}-rpm.patch Patch1: %{name}-shared.patch -License: BSD with advertising +# most sources are under BSD-3-Clause, except: +# demosrc/stb_image.h: MIT and/or Unlicense +# demosrc/stb_image_write.h: MIT and/or Unlicense +# demosrc/tiny_obj_loader.h: MIT +# demosrc/trackball.c: SGI-OpenGL +# demosrc/trackball.h: SGI-OpenGL +# docs/*.sty: LPPL +# except: +# docs/algorithm.sty: LGPL-2.0-or-later +# docs/algorithmic.sty: LGPL-2.0-or-later +License: BSD-3-Clause AND MIT AND ( MIT OR Unlicense ) AND LPPL AND SGI-OpenGL AND LGPL-2.0-or-later BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: libGL-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: latex2html -BuildRequires: %{_bindir}/dvips -BuildRequires: %{_bindir}/latex -BuildRequires: %{_bindir}/pdflatex +BuildRequires: texlive-dvips +BuildRequires: texlive-latex %description A portable, high performance parallel ray tracing system with @@ -70,18 +79,17 @@ This package contains documentation and example scenes for rendering with tachyon. %prep -%setup -q -n %{name} -%patch0 -p1 -b .r -%patch1 -p1 -b .shared +%autosetup -p1 -n %{name} find . -name CVS | xargs rm -r # executable sources chmod 644 src/hash.{c,h} chmod 644 src/pngfile.h chmod 644 demosrc/spaceball.c chmod 644 demosrc/trackball.{c,h} -chmod 644 scenes/imaps/* +# delete private symlinks +rm -v scenes/{imaps,tpoly,vol} # work around unsupported -m32 gcc option -%ifarch armv7hl aarch64 +%ifarch aarch64 sed -i -e 's/-m32 //g' unix/Make-arch sed -i -e 's/-m64 //g' unix/Make-arch %endif @@ -111,7 +119,6 @@ echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 cp -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ - %files %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* @@ -133,6 +140,13 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Jan 17 2025 Dominik Mierzejewski <dominik(a)greysector.net> - 0.99.5-1 +- update to 0.99.5 +- avoid using obsolete patchN macro +- rebase patches and drop unused hunks +- enumerate licenses and update License: tag +- use package names instead of file references in BuildRequires + * Sat Jan 27 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.31.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild commit 61cfe02b22a7085013574eea43bb9d7c179160c9 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jan 22 10:15:36 2025 +0000 Unretirement request: pagure.io/releng/issue/12536 Revert "Orphaned for 6+ weeks" This reverts commit af53181c617602ed27577549616d3c89cf43e443. Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34ab1f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +tachyon-0.98.7.tar.gz +tachyon.1 +/tachyon-0.99b2.tar.gz +/tachyon-0.99b6.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..11ac7eb --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +491604338614814996bfe54b6ad113d4 tachyon.1 +9e5ed4045c472e01e57480d7c7eee849 tachyon-0.99b6.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch new file mode 100644 index 0000000..1f31099 --- /dev/null +++ b/tachyon-rpm.patch @@ -0,0 +1,192 @@ +diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch +--- tachyon/unix/Make-arch.r 2013-04-21 21:09:28.000000000 +0200 ++++ tachyon/unix/Make-arch 2013-08-09 00:26:25.175778876 +0200 +@@ -11,7 +11,7 @@ RANLIB= touch + + MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) + MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) +-MISCFLAGS=$(MISCDEFS) $(MISCINC) ++MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS) + MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) + + default: +@@ -1217,10 +1217,10 @@ linux-64-thr: + $(MAKE) all \ + "ARCH = linux-64-thr" \ + "CC = gcc" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + +@@ -1364,10 +1364,10 @@ linux-thr: + $(MAKE) all \ + "ARCH = linux-thr" \ + "CC = gcc" \ +- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + +@@ -1376,7 +1376,7 @@ linux-thr-ogl: + $(MAKE) all \ + "ARCH = linux-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ +@@ -1387,7 +1387,7 @@ linux-64-thr-ogl: + $(MAKE) all \ + "ARCH = linux-64-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ +@@ -1446,25 +1446,37 @@ linux-beowulf-mpi: + linux-lam: + $(MAKE) all \ + "ARCH = linux-lam" \ +- "CC = hcc" \ +- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" ++ ++# Linux x86 using LAM MPI, with OpenGL display ++linux-lam-ogl: ++ $(MAKE) all \ ++ "ARCH = linux-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + + # Linux AMD64/EM64T using LAM MPI +-linux-lam-64: ++linux-64-lam: + $(MAKE) all \ +- "ARCH = linux-lam-64" \ +- "CC = hcc" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ ++ "ARCH = linux-64-lam" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DLP64 $(MISCFLAGS) $(MPIFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" + + linux-mpi: + $(MAKE) all \ +@@ -1524,16 +1536,16 @@ linux-mpi-ogl: + "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + + # Linux AMD64/EM64T using LAM MPI, with OpenGL display +-linux-lam-64-ogl: ++linux-64-lam-ogl: + $(MAKE) all \ +- "ARCH = linux-lam-64-ogl" \ +- "CC = hcc" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ ++ "ARCH = linux-64-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + + # Linux x86 using LAM MPI and threads + linux-lam-thr: +diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config +--- tachyon/unix/Make-config.r 2013-04-21 21:09:28.000000000 +0200 ++++ tachyon/unix/Make-config 2013-08-09 00:20:28.804492178 +0200 +@@ -105,7 +105,7 @@ THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS + ########################################################################## + # Customize MPI directories and includes as-needed. + # A typical MPICH installation location: +-MPIDIR=/usr/local/mpi ++MPIDIR=/usr + MPIINC=$(MPIDIR)/include + MPILIB=$(MPIDIR)/lib + +@@ -125,7 +125,9 @@ MPIFLAGS=-DMPI -DUSE_MPI_IN_PLACE + # MPI 1.x flags: + #MPIFLAGS=-DMPI + +- ++# LAM ++LAMFLAGS=`pkg-config --cflags lam` ++LAMLIBS=`pkg-config --libs lam` + + ########################################################################## + # Floating point configuration: +@@ -166,14 +168,14 @@ MBOX= + # http://www.ijg.org/files/ + ########################################################################## + # Uncomment the following lines to disable JPEG support +-USEJPEG= +-JPEGINC= +-JPEGLIB= ++#USEJPEG= ++#JPEGINC= ++#JPEGLIB= + + # Uncomment the following lines to enable JPEG support +-#USEJPEG= -DUSEJPEG +-#JPEGINC= -I/usr/local/include +-#JPEGLIB= -L/usr/local/lib -ljpeg ++USEJPEG= -DUSEJPEG ++JPEGINC= ++JPEGLIB= -ljpeg + + + ########################################################################## +@@ -186,14 +188,14 @@ JPEGLIB= + # http://www.libpng.org/ + ########################################################################## + # Uncomment the following lines to disable PNG support +-USEPNG= +-PNGINC= +-PNGLIB= ++#USEPNG= ++#PNGINC= ++#PNGLIB= + + # Uncomment the following lines to enable PNG support +-#USEPNG= -DUSEPNG +-#PNGINC= -I/usr/local/include +-#PNGLIB= -L/usr/local/lib -lpng -lz ++USEPNG= -DUSEPNG ++PNGINC= `pkg-config --cflags libpng` ++PNGLIB= `pkg-config --libs libpng` + + + ########################################################################## diff --git a/tachyon-shared.patch b/tachyon-shared.patch new file mode 100644 index 0000000..a5d328d --- /dev/null +++ b/tachyon-shared.patch @@ -0,0 +1,179 @@ +diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile +--- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 ++++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200 +@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon + # + # Name of raytracing library file to create + # +-RAYLIB=${ARCHDIR}/libtachyon.a ++RAYLIB=${ARCHDIR}/libtachyon.so + RAYLIBDIR=${ARCHDIR} + + # +@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ + ${OBJDIR}/tgafile.o \ + ${OBJDIR}/winbmp.o + ++${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2) ++${RAYLIB} : DIRNAME=tachyon-${VERSION} + ${RAYLIB} : ${RAYOBJS} +- rm -f ${RAYLIB} +- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} +- ${RANLIB} ${RAYLIB} ++ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ${JPEGLIB} ++ ln -s lib${DIRNAME}.so $@ + + ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o + + ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o + + ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o + + ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o + + ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o + + ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o + + ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o + + ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o + + ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o + + ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o + + ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o + + ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o + + ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o + + ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o + + ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o + + ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o + + ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o + + ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o + + ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o + + ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o + + ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o + + ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o + + ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o + + ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o + + ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o + + ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o + + ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o + + ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o + + ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o + + ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o + + ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o + + ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o + + ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o + + ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o + + ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o + + ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o + + ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o + + ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o + + clean : + @echo "Cleaning object files, binaries etc." diff --git a/tachyon.spec b/tachyon.spec new file mode 100644 index 0000000..ca6abeb --- /dev/null +++ b/tachyon.spec @@ -0,0 +1,301 @@ +%if 0%{?__isa_bits} == 64 +%define target linux-64 +%else +%define target linux +%endif + +%define variants thr thr-ogl +%define beta b6 + +Summary: Parallel / Multiprocessor Ray Tracing System +Name: tachyon +Version: 0.99 +Release: 0.31.%{beta}%{?dist} +URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ +Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… +# taken from Debian package +Source1: %{name}.1 +Patch0: %{name}-rpm.patch +Patch1: %{name}-shared.patch +License: BSD with advertising +BuildRequires: make +BuildRequires: gcc +BuildRequires: libGL-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: latex2html +BuildRequires: %{_bindir}/dvips +BuildRequires: %{_bindir}/latex +BuildRequires: %{_bindir}/pdflatex + +%description +A portable, high performance parallel ray tracing system with +multithreaded implementation. + +%package libs +Summary: Parallel / Multiprocessor Ray Tracing System library + +%description libs +A portable, high performance parallel ray tracing system with +multithreaded implementation. Tachyon is built as a C callable +library, which can be used with the included demo programs or within +your own application. + +This package contains the shared library. + +%package gl +Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display +Provides: %{name} = %{version}-%{release} + +%description gl +A portable, high performance parallel ray tracing system with +multithreaded implementation. + +This package contains OpenGL-enabled build. + +%package devel +Summary: Development files for tachyon +Requires: %{name}-libs = %{version}-%{release} + +%description devel +This package contains development headers and libraries for developing +with tachyon. + +%package docs +Summary: Documentation and example scenes for tachyon +Requires: %{name} = %{version}-%{release} + +%description docs +This package contains documentation and example scenes for rendering +with tachyon. + +%prep +%setup -q -n %{name} +%patch0 -p1 -b .r +%patch1 -p1 -b .shared +find . -name CVS | xargs rm -r +# executable sources +chmod 644 src/hash.{c,h} +chmod 644 src/pngfile.h +chmod 644 demosrc/spaceball.c +chmod 644 demosrc/trackball.{c,h} +chmod 644 scenes/imaps/* +# work around unsupported -m32 gcc option +%ifarch armv7hl aarch64 +sed -i -e 's/-m32 //g' unix/Make-arch +sed -i -e 's/-m64 //g' unix/Make-arch +%endif + +%build +pushd unix +for variant in %{variants} ; do + make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant +done +popd + +pushd docs +make html pdf ps +popd + +%install +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1} +for variant in %{variants} ; do + install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant +done +rename -- -thr "" $RPM_BUILD_ROOT%{_bindir}/* +mkdir docs/html +cp -pr docs/tachyon/*.{css,html,png} docs/html +cp -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ +install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ +echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 +cp -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ +install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ + + +%files +%attr(755,root,root) %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* + +%files libs +%doc Copyright README +%{_libdir}/libtachyon-%{version}.so + +%files gl +%attr(755,root,root) %{_bindir}/%{name}-ogl +%{_mandir}/man1/%{name}-ogl.1* + +%files devel +%{_includedir}/tachyon +%{_libdir}/libtachyon.so + +%files docs +%doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html +%{_datadir}/tachyon + +%changelog +* Sat Jan 27 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.31.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.30.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.29.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.28.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.27.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.26.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.25.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.24.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.23.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.22.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.21.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.20.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.19.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.18.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.17.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.16.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.15.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 15 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.99-0.14.b6 +- Use __isa_bits macro instead of list of 64-bit architectures + +* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.13.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.12.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 13 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.99-0.11.b6 +- Fix build on aarch64 +- Adjust ppc64 macro +- Cleanup spec + +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.10.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Aug 09 2013 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.9.b6 +- update to 0.99b6 +- fix build on armv7hl + +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.8.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.7.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.99-0.6.b2 +- rebuild against new libjpeg + +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.5.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Adam Jackson <ajax(a)redhat.com> 0.99-0.4.b2 +- Fix invocation of rename(1) in %%install + +* Tue Dec 06 2011 Adam Jackson <ajax(a)redhat.com> - 0.99-0.3.b2 +- Rebuild for new libpng + +* Sat Jul 23 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.2.b2 +- install missing tachyon_dep.h header +- link shared library against libjpeg to avoid unresolved symbols + +* Sun Apr 10 2011 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.99-0.1.b2 +- updated to 0.99b2 +- rebased patch +- updated BRs + +* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Feb 09 2010 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.9-1 +- update to 0.98.9 + +* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 +- drop LAM support +- add shared library (based on Debian patch) +- simplify some specfile constructs +- improve descriptions + +* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm(a)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(a)lists.fedoraproject.org> - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm(a)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(a)lists.fedoraproject.org> - 0.98-0.8.20070319 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.7.20070319 +- fix build with new lam package +- use generic BR for libGLU-devel +- move tree cleanup to %%prep to fix short-circuit builds + +* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.98-0.6.20070319 +- Autorebuild for GCC 4.3 + +* Thu Dec 13 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.5 +- more seamless variant handling +- use proper lam cflags and ldflags (as reported by pkgconfig) + +* Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.4 +- add support for Alpha + +* Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.3 +- rebuild +- update license tag + +* Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.2 +- add support for ppc64 and sparc64, simplify target setting + +* Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.1 +- update to 0.98 pre-release + +* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-4 +- fix copy&paste error in patch + +* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-3 +- add SPARC support + +* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-2 +- use only kosher CFLAGS +- fix target setting + +* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-1 +- initial build +- patch to add necessary build targets commit af53181c617602ed27577549616d3c89cf43e443 Author: Maxwell G <maxwell(a)gtmx.me> Date: Sat Feb 24 07:06:34 2024 +0000 Orphaned for 6+ weeks diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 34ab1f9..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -tachyon-0.98.7.tar.gz -tachyon.1 -/tachyon-0.99b2.tar.gz -/tachyon-0.99b6.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 11ac7eb..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -491604338614814996bfe54b6ad113d4 tachyon.1 -9e5ed4045c472e01e57480d7c7eee849 tachyon-0.99b6.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch deleted file mode 100644 index 1f31099..0000000 --- a/tachyon-rpm.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch ---- tachyon/unix/Make-arch.r 2013-04-21 21:09:28.000000000 +0200 -+++ tachyon/unix/Make-arch 2013-08-09 00:26:25.175778876 +0200 -@@ -11,7 +11,7 @@ RANLIB= touch - - MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) - MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) --MISCFLAGS=$(MISCDEFS) $(MISCINC) -+MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS) - MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) - - default: -@@ -1217,10 +1217,10 @@ linux-64-thr: - $(MAKE) all \ - "ARCH = linux-64-thr" \ - "CC = gcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ - "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" - -@@ -1364,10 +1364,10 @@ linux-thr: - $(MAKE) all \ - "ARCH = linux-thr" \ - "CC = gcc" \ -- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ - "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" - -@@ -1376,7 +1376,7 @@ linux-thr-ogl: - $(MAKE) all \ - "ARCH = linux-thr-ogl" \ - "CC = cc" \ -- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ -+ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = touch" \ -@@ -1387,7 +1387,7 @@ linux-64-thr-ogl: - $(MAKE) all \ - "ARCH = linux-64-thr-ogl" \ - "CC = cc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ -+ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = touch" \ -@@ -1446,25 +1446,37 @@ linux-beowulf-mpi: - linux-lam: - $(MAKE) all \ - "ARCH = linux-lam" \ -- "CC = hcc" \ -- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ -+ "RANLIB = ranlib" \ -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" -+ -+# Linux x86 using LAM MPI, with OpenGL display -+linux-lam-ogl: -+ $(MAKE) all \ -+ "ARCH = linux-lam-ogl" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ -+ "AR = ar" \ -+ "ARFLAGS = r" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux AMD64/EM64T using LAM MPI --linux-lam-64: -+linux-64-lam: - $(MAKE) all \ -- "ARCH = linux-lam-64" \ -- "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ -+ "ARCH = linux-64-lam" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DLP64 $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" - - linux-mpi: - $(MAKE) all \ -@@ -1524,16 +1536,16 @@ linux-mpi-ogl: - "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux AMD64/EM64T using LAM MPI, with OpenGL display --linux-lam-64-ogl: -+linux-64-lam-ogl: - $(MAKE) all \ -- "ARCH = linux-lam-64-ogl" \ -- "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ -+ "ARCH = linux-64-lam-ogl" \ -+ "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ -- "STRIP = strip" \ -+ "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" -+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" - - # Linux x86 using LAM MPI and threads - linux-lam-thr: -diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ---- tachyon/unix/Make-config.r 2013-04-21 21:09:28.000000000 +0200 -+++ tachyon/unix/Make-config 2013-08-09 00:20:28.804492178 +0200 -@@ -105,7 +105,7 @@ THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS - ########################################################################## - # Customize MPI directories and includes as-needed. - # A typical MPICH installation location: --MPIDIR=/usr/local/mpi -+MPIDIR=/usr - MPIINC=$(MPIDIR)/include - MPILIB=$(MPIDIR)/lib - -@@ -125,7 +125,9 @@ MPIFLAGS=-DMPI -DUSE_MPI_IN_PLACE - # MPI 1.x flags: - #MPIFLAGS=-DMPI - -- -+# LAM -+LAMFLAGS=`pkg-config --cflags lam` -+LAMLIBS=`pkg-config --libs lam` - - ########################################################################## - # Floating point configuration: -@@ -166,14 +168,14 @@ MBOX= - # http://www.ijg.org/files/ - ########################################################################## - # Uncomment the following lines to disable JPEG support --USEJPEG= --JPEGINC= --JPEGLIB= -+#USEJPEG= -+#JPEGINC= -+#JPEGLIB= - - # Uncomment the following lines to enable JPEG support --#USEJPEG= -DUSEJPEG --#JPEGINC= -I/usr/local/include --#JPEGLIB= -L/usr/local/lib -ljpeg -+USEJPEG= -DUSEJPEG -+JPEGINC= -+JPEGLIB= -ljpeg - - - ########################################################################## -@@ -186,14 +188,14 @@ JPEGLIB= - # http://www.libpng.org/ - ########################################################################## - # Uncomment the following lines to disable PNG support --USEPNG= --PNGINC= --PNGLIB= -+#USEPNG= -+#PNGINC= -+#PNGLIB= - - # Uncomment the following lines to enable PNG support --#USEPNG= -DUSEPNG --#PNGINC= -I/usr/local/include --#PNGLIB= -L/usr/local/lib -lpng -lz -+USEPNG= -DUSEPNG -+PNGINC= `pkg-config --cflags libpng` -+PNGLIB= `pkg-config --libs libpng` - - - ########################################################################## diff --git a/tachyon-shared.patch b/tachyon-shared.patch deleted file mode 100644 index a5d328d..0000000 --- a/tachyon-shared.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile ---- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 -+++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200 -@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon - # - # Name of raytracing library file to create - # --RAYLIB=${ARCHDIR}/libtachyon.a -+RAYLIB=${ARCHDIR}/libtachyon.so - RAYLIBDIR=${ARCHDIR} - - # -@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ - ${OBJDIR}/tgafile.o \ - ${OBJDIR}/winbmp.o - -+${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2) -+${RAYLIB} : DIRNAME=tachyon-${VERSION} - ${RAYLIB} : ${RAYOBJS} -- rm -f ${RAYLIB} -- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} -- ${RANLIB} ${RAYLIB} -+ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ${JPEGLIB} -+ ln -s lib${DIRNAME}.so $@ - - ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o - - ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o - - ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o - - ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o - - ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h -- ${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o - - ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o - - ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o - - ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o - - ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o - - ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o - - ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o - - ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h -- ${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o - - ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o - - ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o - - ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o - - ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o - - ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o - - ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o - - ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o - - ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o - - ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o - - ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h -- ${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o - - ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o - - ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o - - ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o - - ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o - - ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o - - ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o - - ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o - - ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o - - ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o - - ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h -- ${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o - - ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o - - ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o - - ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o - - ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o - - ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS} -- ${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o - - ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h -- ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o -+ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o - - clean : - @echo "Cleaning object files, binaries etc." diff --git a/tachyon.spec b/tachyon.spec deleted file mode 100644 index ca6abeb..0000000 --- a/tachyon.spec +++ /dev/null @@ -1,301 +0,0 @@ -%if 0%{?__isa_bits} == 64 -%define target linux-64 -%else -%define target linux -%endif - -%define variants thr thr-ogl -%define beta b6 - -Summary: Parallel / Multiprocessor Ray Tracing System -Name: tachyon -Version: 0.99 -Release: 0.31.%{beta}%{?dist} -URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ -Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… -# taken from Debian package -Source1: %{name}.1 -Patch0: %{name}-rpm.patch -Patch1: %{name}-shared.patch -License: BSD with advertising -BuildRequires: make -BuildRequires: gcc -BuildRequires: libGL-devel -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel -BuildRequires: latex2html -BuildRequires: %{_bindir}/dvips -BuildRequires: %{_bindir}/latex -BuildRequires: %{_bindir}/pdflatex - -%description -A portable, high performance parallel ray tracing system with -multithreaded implementation. - -%package libs -Summary: Parallel / Multiprocessor Ray Tracing System library - -%description libs -A portable, high performance parallel ray tracing system with -multithreaded implementation. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. - -This package contains the shared library. - -%package gl -Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display -Provides: %{name} = %{version}-%{release} - -%description gl -A portable, high performance parallel ray tracing system with -multithreaded implementation. - -This package contains OpenGL-enabled build. - -%package devel -Summary: Development files for tachyon -Requires: %{name}-libs = %{version}-%{release} - -%description devel -This package contains development headers and libraries for developing -with tachyon. - -%package docs -Summary: Documentation and example scenes for tachyon -Requires: %{name} = %{version}-%{release} - -%description docs -This package contains documentation and example scenes for rendering -with tachyon. - -%prep -%setup -q -n %{name} -%patch0 -p1 -b .r -%patch1 -p1 -b .shared -find . -name CVS | xargs rm -r -# executable sources -chmod 644 src/hash.{c,h} -chmod 644 src/pngfile.h -chmod 644 demosrc/spaceball.c -chmod 644 demosrc/trackball.{c,h} -chmod 644 scenes/imaps/* -# work around unsupported -m32 gcc option -%ifarch armv7hl aarch64 -sed -i -e 's/-m32 //g' unix/Make-arch -sed -i -e 's/-m64 //g' unix/Make-arch -%endif - -%build -pushd unix -for variant in %{variants} ; do - make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant -done -popd - -pushd docs -make html pdf ps -popd - -%install -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1} -for variant in %{variants} ; do - install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant -done -rename -- -thr "" $RPM_BUILD_ROOT%{_bindir}/* -mkdir docs/html -cp -pr docs/tachyon/*.{css,html,png} docs/html -cp -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ -install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ -echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 -cp -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ -install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ - - -%files -%attr(755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* - -%files libs -%doc Copyright README -%{_libdir}/libtachyon-%{version}.so - -%files gl -%attr(755,root,root) %{_bindir}/%{name}-ogl -%{_mandir}/man1/%{name}-ogl.1* - -%files devel -%{_includedir}/tachyon -%{_libdir}/libtachyon.so - -%files docs -%doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html -%{_datadir}/tachyon - -%changelog -* Sat Jan 27 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.31.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.30.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.29.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.28.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.27.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.26.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.25.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.24.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.23.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.22.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.21.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.20.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.19.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.18.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.17.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.16.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.15.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Sep 15 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.99-0.14.b6 -- Use __isa_bits macro instead of list of 64-bit architectures - -* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.13.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.12.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 13 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.99-0.11.b6 -- Fix build on aarch64 -- Adjust ppc64 macro -- Cleanup spec - -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.10.b6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 09 2013 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.9.b6 -- update to 0.99b6 -- fix build on armv7hl - -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.8.b2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.7.b2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.99-0.6.b2 -- rebuild against new libjpeg - -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.5.b2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Adam Jackson <ajax(a)redhat.com> 0.99-0.4.b2 -- Fix invocation of rename(1) in %%install - -* Tue Dec 06 2011 Adam Jackson <ajax(a)redhat.com> - 0.99-0.3.b2 -- Rebuild for new libpng - -* Sat Jul 23 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.2.b2 -- install missing tachyon_dep.h header -- link shared library against libjpeg to avoid unresolved symbols - -* Sun Apr 10 2011 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.99-0.1.b2 -- updated to 0.99b2 -- rebased patch -- updated BRs - -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Feb 09 2010 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.9-1 -- update to 0.98.9 - -* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 -- drop LAM support -- add shared library (based on Debian patch) -- simplify some specfile constructs -- improve descriptions - -* Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm(a)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(a)lists.fedoraproject.org> - 0.98.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm(a)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(a)lists.fedoraproject.org> - 0.98-0.8.20070319 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.7.20070319 -- fix build with new lam package -- use generic BR for libGLU-devel -- move tree cleanup to %%prep to fix short-circuit builds - -* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.98-0.6.20070319 -- Autorebuild for GCC 4.3 - -* Thu Dec 13 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.5 -- more seamless variant handling -- use proper lam cflags and ldflags (as reported by pkgconfig) - -* Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.4 -- add support for Alpha - -* Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.3 -- rebuild -- update license tag - -* Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.2 -- add support for ppc64 and sparc64, simplify target setting - -* Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.1 -- update to 0.98 pre-release - -* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-4 -- fix copy&paste error in patch - -* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-3 -- add SPARC support - -* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-2 -- use only kosher CFLAGS -- fix target setting - -* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-1 -- initial build -- patch to add necessary build targets commit 650379070987c48589fd535cfe385ea32dcf5423 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jan 27 05:16:48 2024 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index cc55c8a..ca6abeb 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.30.%{beta}%{?dist} +Release: 0.31.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jan 27 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.31.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.30.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild commit d04aa849a3489a38fae6f704d3eaee5a71277267 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jul 22 03:08:20 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index caf4391..cc55c8a 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.29.%{beta}%{?dist} +Release: 0.30.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jul 22 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.30.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.29.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild commit c1e327bffe9adfa40340f12749cd4416a2390556 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jan 21 04:36:15 2023 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index d3b639f..caf4391 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.28.%{beta}%{?dist} +Release: 0.29.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.29.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.28.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild commit 4dce5617997a9c8e8c3a236764e06c092ba5dad8 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jul 23 10:02:13 2022 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 64774b6..d3b639f 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.27.%{beta}%{?dist} +Release: 0.28.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.28.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.27.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild commit 77bc3967d7e9b06daf09790338ff9160a9d240ff Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jan 22 02:14:58 2022 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 1f57616..64774b6 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.26.%{beta}%{?dist} +Release: 0.27.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.27.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.26.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild commit db0ac2b226df20a07be0ca10b2f09e530fdcd169 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jul 23 18:49:56 2021 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 86d0a1b..1f57616 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.25.%{beta}%{?dist} +Release: 0.26.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.26.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.25.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild commit 2eb446d1a43569089a506b90e9bd3a159afadf53 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jan 27 21:33:53 2021 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index adf61bb..86d0a1b 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.24.%{beta}%{?dist} +Release: 0.25.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -133,6 +133,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.25.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.24.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild commit 34dba640c155f217a9dcccba92fe71b20df9e264 Author: Tom Stellard <tstellar(a)redhat.com> Date: Fri Jan 8 22:14:27 2021 +0000 Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot diff --git a/tachyon.spec b/tachyon.spec index 985911d..adf61bb 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -18,6 +18,7 @@ Source1: %{name}.1 Patch0: %{name}-rpm.patch Patch1: %{name}-shared.patch License: BSD with advertising +BuildRequires: make BuildRequires: gcc BuildRequires: libGL-devel BuildRequires: libpng-devel commit 20b2771ab77d8f717b244cbf6ce629691f781027 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jul 29 12:02:49 2020 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 6e1ce33..985911d 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.23.%{beta}%{?dist} +Release: 0.24.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -132,6 +132,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.24.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.23.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild commit 04441074c1aa1b6c4c9586aa367ceb3fb34cb7ec Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jan 31 01:01:26 2020 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index b31285c..6e1ce33 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.22.%{beta}%{?dist} +Release: 0.23.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -132,6 +132,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.23.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.22.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild commit 1b2d3a9c2b64a26d0de09fca1dfdc5d73c175da4 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jul 27 00:56:28 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 9f45d2d..b31285c 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.21.%{beta}%{?dist} +Release: 0.22.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -132,6 +132,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.22.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.21.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild commit 63b086c3a7a60172ddd9a610bdd1d823f1a592f5 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sun Feb 3 09:20:53 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index cdcd067..9f45d2d 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.20.%{beta}%{?dist} +Release: 0.21.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package @@ -132,6 +132,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.21.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.20.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild commit a75dab4802f0f19de65690f6a0b21098cf8e8c45 Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Mon Jan 28 20:18:27 2019 +0100 Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag diff --git a/tachyon.spec b/tachyon.spec index 8bbc002..cdcd067 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -12,7 +12,6 @@ Name: tachyon Version: 0.99 Release: 0.20.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ -Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package Source1: %{name}.1 @@ -34,7 +33,6 @@ multithreaded implementation. %package libs Summary: Parallel / Multiprocessor Ray Tracing System library -Group: System Environment/Libraries %description libs A portable, high performance parallel ray tracing system with @@ -46,7 +44,6 @@ This package contains the shared library. %package gl Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display -Group: Applications/Engineering Provides: %{name} = %{version}-%{release} %description gl @@ -57,7 +54,6 @@ This package contains OpenGL-enabled build. %package devel Summary: Development files for tachyon -Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel @@ -66,7 +62,6 @@ with tachyon. %package docs Summary: Documentation and example scenes for tachyon -Group: Documentation Requires: %{name} = %{version}-%{release} %description docs commit 5b219028f1a69b17b41e9969d882955428032cda Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Tue Jul 24 16:09:11 2018 +0200 Add missing BuildRequires on gcc make[2]: gcc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606479 Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index bcfdca3..8bbc002 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -19,6 +19,7 @@ Source1: %{name}.1 Patch0: %{name}-rpm.patch Patch1: %{name}-shared.patch License: BSD with advertising +BuildRequires: gcc BuildRequires: libGL-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel commit a5cd76917048b3d83115e38ba77e2886ec4adaa0 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Jul 14 07:13:51 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 946632f..bcfdca3 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.19.%{beta}%{?dist} +Release: 0.20.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -136,6 +136,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.20.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.19.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild commit badde442ff340717733573ef93e137507b390d3f Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Wed Feb 14 00:43:47 2018 +0100 Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 2251af6..946632f 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -19,7 +19,6 @@ Source1: %{name}.1 Patch0: %{name}-rpm.patch Patch1: %{name}-shared.patch License: BSD with advertising -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: libGL-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel commit 3ebe342566705dcd14e76959bf1e5f67f05de839 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Feb 9 18:24:40 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/tachyon.spec b/tachyon.spec index 1de8112..2251af6 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.18.%{beta}%{?dist} +Release: 0.19.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.19.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.18.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild commit d17bf1662192fd12e9ba1b6f4f6e1e02798e2b31 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Aug 3 09:07:56 2017 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 819ff9c..1de8112 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.17.%{beta}%{?dist} +Release: 0.18.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.18.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.17.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild commit 911950d8f7d5ea1137aef0d2ca0356e007d0d62c Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 27 19:54:05 2017 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 9dd5c47..819ff9c 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.16.%{beta}%{?dist} +Release: 0.17.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.17.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.16.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild commit 944b6d90ee7fb2ecabd329e91ee80dd5de9a3fba Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Feb 11 15:31:31 2017 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 0a3ddd5..9dd5c47 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.15.%{beta}%{?dist} +Release: 0.16.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.16.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.15.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild commit b6f06fb20175b1691f29146d36776cf6db5317a9 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Feb 5 01:14:09 2016 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 2f20188..0a3ddd5 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.14.%{beta}%{?dist} +Release: 0.15.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-0.15.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Sep 15 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.99-0.14.b6 - Use __isa_bits macro instead of list of 64-bit architectures commit 22bb4353b69002269f64a3ee7780896438ce6cd5 Author: Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> Date: Tue Sep 15 14:24:24 2015 +0200 Use __isa_bits macro instead of list of 64-bit architectures diff --git a/tachyon.spec b/tachyon.spec index adb0f6f..2f20188 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -1,4 +1,4 @@ -%ifarch alpha %{power64} sparc64 x86_64 aarch64 +%if 0%{?__isa_bits} == 64 %define target linux-64 %else %define target linux @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.13.%{beta}%{?dist} +Release: 0.14.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Tue Sep 15 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.99-0.14.b6 +- Use __isa_bits macro instead of list of 64-bit architectures + * Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.13.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild commit a84f74a3c7b67cca8d6f2ceb77f781a00ba21baf Author: Dennis Gilmore <dennis(a)ausil.us> Date: Fri Jun 19 02:26:45 2015 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 7e932eb..adb0f6f 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.12.%{beta}%{?dist} +Release: 0.13.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.13.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.12.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild commit 9ca47540dcf0599e02d69a946beaabe5794ebb4c Author: Peter Robinson <pbrobinson(a)fedoraproject.org> Date: Mon Aug 18 04:44:13 2014 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 55fc3ea..7e932eb 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.11.%{beta}%{?dist} +Release: 0.12.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -137,6 +137,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.12.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 13 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.99-0.11.b6 - Fix build on aarch64 - Adjust ppc64 macro commit d844023fdc2834618d128ece18a4edfc4135ef46 Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Mon Jun 16 21:41:20 2014 +0100 Fix build on aarch64, Adjust ppc64 macro, Cleanup spec diff --git a/tachyon.spec b/tachyon.spec index a869e9e..55fc3ea 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -1,4 +1,4 @@ -%ifarch alpha ppc64 sparc64 x86_64 +%ifarch alpha %{power64} sparc64 x86_64 aarch64 %define target linux-64 %else %define target linux @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.10.%{beta}%{?dist} +Release: 0.11.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -77,7 +77,7 @@ with tachyon. %setup -q -n %{name} %patch0 -p1 -b .r %patch1 -p1 -b .shared -find . -name CVS | xargs %{__rm} -r +find . -name CVS | xargs rm -r # executable sources chmod 644 src/hash.{c,h} chmod 644 src/pngfile.h @@ -85,65 +85,63 @@ chmod 644 demosrc/spaceball.c chmod 644 demosrc/trackball.{c,h} chmod 644 scenes/imaps/* # work around unsupported -m32 gcc option -%ifarch armv7hl +%ifarch armv7hl aarch64 sed -i -e 's/-m32 //g' unix/Make-arch +sed -i -e 's/-m64 //g' unix/Make-arch %endif %build pushd unix for variant in %{variants} ; do - %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant + make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant done popd pushd docs -%{__make} html pdf ps +make html pdf ps popd %install -%{__rm} -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1} for variant in %{variants} ; do install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant done rename -- -thr "" $RPM_BUILD_ROOT%{_bindir}/* mkdir docs/html -%{__cp} -pr docs/tachyon/*.{css,html,png} docs/html -%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ +cp -pr docs/tachyon/*.{css,html,png} docs/html +cp -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 -%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ +cp -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ -%clean -%{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %files libs -%defattr(644,root,root,755) %doc Copyright README %{_libdir}/libtachyon-%{version}.so %files gl -%defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name}-ogl %{_mandir}/man1/%{name}-ogl.1* %files devel -%defattr(644,root,root,755) %{_includedir}/tachyon %{_libdir}/libtachyon.so %files docs -%defattr(644,root,root,755) %doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html %{_datadir}/tachyon %changelog +* Fri Jun 13 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.99-0.11.b6 +- Fix build on aarch64 +- Adjust ppc64 macro +- Cleanup spec + * Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.10.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild commit 506ac996c5d1a14ccca0993384ebc05c9efb224e Author: Dennis Gilmore <dennis(a)ausil.us> Date: Sun Jun 8 03:03:39 2014 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index ed249a5..a869e9e 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.9.%{beta}%{?dist} +Release: 0.10.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -144,6 +144,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.10.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Aug 09 2013 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.9.b6 - update to 0.99b6 - fix build on armv7hl commit aa43e7f5502144898d46772679ca5ed20d739922 Author: Dominik Mierzejewski <rpm(a)greysector.net> Date: Fri Aug 9 00:36:38 2013 +0200 update to 0.99b6 - fix build on armv7hl diff --git a/.gitignore b/.gitignore index c4ca246..34ab1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ tachyon-0.98.7.tar.gz tachyon.1 /tachyon-0.99b2.tar.gz +/tachyon-0.99b6.tar.gz diff --git a/sources b/sources index 2357ffc..11ac7eb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6751ee2c59f8614ae693dba82e20cc73 tachyon-0.99b2.tar.gz 491604338614814996bfe54b6ad113d4 tachyon.1 +9e5ed4045c472e01e57480d7c7eee849 tachyon-0.99b6.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index befed75..1f31099 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,7 +1,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch ---- tachyon/unix/Make-arch.r 2011-02-18 19:19:55.000000000 +0100 -+++ tachyon/unix/Make-arch 2011-07-23 20:16:02.000000000 +0200 -@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib +--- tachyon/unix/Make-arch.r 2013-04-21 21:09:28.000000000 +0200 ++++ tachyon/unix/Make-arch 2013-08-09 00:26:25.175778876 +0200 +@@ -11,7 +11,7 @@ RANLIB= touch MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) @@ -10,12 +10,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -1103,10 +1103,10 @@ linux-64-thr: +@@ -1217,10 +1217,10 @@ linux-64-thr: $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -23,12 +23,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1202,10 +1202,10 @@ linux-thr: +@@ -1364,10 +1364,10 @@ linux-thr: $(MAKE) all \ "ARCH = linux-thr" \ "CC = gcc" \ -- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ -+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ +- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -36,38 +36,37 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1214,7 +1214,7 @@ linux-thr-ogl: +@@ -1376,7 +1376,7 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ -- "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)" \ +- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "CFLAGS = -m32 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1225,7 +1225,7 @@ linux-64-thr-ogl: +@@ -1387,7 +1387,7 @@ linux-64-thr-ogl: $(MAKE) all \ "ARCH = linux-64-thr-ogl" \ "CC = cc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ -+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -DLP64 -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1284,25 +1284,37 @@ linux-beowulf-mpi: +@@ -1446,25 +1446,37 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ - "CC = hcc" \ -- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ +- "CFLAGS = -m486 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ + "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display @@ -75,11 +74,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-lam-ogl" \ + "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux $(MISCFLAGS) $(MPIFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" + "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI @@ -88,10 +88,10 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch $(MAKE) all \ - "ARCH = linux-lam-64" \ - "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux $(MISCFLAGS) $(MPIFLAGS)" \ + "ARCH = linux-64-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DLP64 $(MISCFLAGS) $(MPIFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -102,8 +102,8 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch linux-mpi: $(MAKE) all \ -@@ -1340,16 +1352,16 @@ linux-mpi-64: - +@@ -1524,16 +1536,16 @@ linux-mpi-ogl: + "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI, with OpenGL display -linux-lam-64-ogl: @@ -111,10 +111,10 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch $(MAKE) all \ - "ARCH = linux-lam-64-ogl" \ - "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ + "ARCH = linux-64-lam-ogl" \ + "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS) $(MPIFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -126,29 +126,29 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch # Linux x86 using LAM MPI and threads linux-lam-thr: diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ---- tachyon/unix/Make-config.r 2011-01-20 06:35:01.000000000 +0100 -+++ tachyon/unix/Make-config 2011-07-23 20:09:17.000000000 +0200 -@@ -57,7 +57,7 @@ X11LIB= -lX11 +--- tachyon/unix/Make-config.r 2013-04-21 21:09:28.000000000 +0200 ++++ tachyon/unix/Make-config 2013-08-09 00:20:28.804492178 +0200 +@@ -105,7 +105,7 @@ THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS ########################################################################## - - # Standard MPICH installation location + # Customize MPI directories and includes as-needed. + # A typical MPICH installation location: -MPIDIR=/usr/local/mpi +MPIDIR=/usr + MPIINC=$(MPIDIR)/include + MPILIB=$(MPIDIR)/lib - # UMR CS Dept - #MPIDIR=/software/all/mpi -@@ -68,6 +68,10 @@ MPIDIR=/usr/local/mpi - # Cornell Theory Center SP-2 splogin.tc.cornell.edu - #MPIDIR=/usr/local/app/mpich +@@ -125,7 +125,9 @@ MPIFLAGS=-DMPI -DUSE_MPI_IN_PLACE + # MPI 1.x flags: + #MPIFLAGS=-DMPI +- +# LAM +LAMFLAGS=`pkg-config --cflags lam` +LAMLIBS=`pkg-config --libs lam` -+ ########################################################################## # Floating point configuration: -@@ -108,14 +112,14 @@ MBOX= +@@ -166,14 +168,14 @@ MBOX= # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -169,7 +169,7 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ########################################################################## -@@ -128,14 +132,14 @@ JPEGLIB= +@@ -186,14 +188,14 @@ JPEGLIB= # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support diff --git a/tachyon.spec b/tachyon.spec index 5d3e8eb..ed249a5 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -5,12 +5,12 @@ %endif %define variants thr thr-ogl -%define beta b2 +%define beta b6 Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -84,6 +84,10 @@ chmod 644 src/pngfile.h chmod 644 demosrc/spaceball.c chmod 644 demosrc/trackball.{c,h} chmod 644 scenes/imaps/* +# work around unsupported -m32 gcc option +%ifarch armv7hl +sed -i -e 's/-m32 //g' unix/Make-arch +%endif %build pushd unix @@ -140,6 +144,10 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Aug 09 2013 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.9.b6 +- update to 0.99b6 +- fix build on armv7hl + * Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.8.b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild commit bc2a98a4134e92b450bdef8f67ced0f02fd5701d Author: Dennis Gilmore <dennis(a)ausil.us> Date: Sat Aug 3 22:14:28 2013 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index aa1d562..5d3e8eb 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.7.%{beta}%{?dist} +Release: 0.8.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.8.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.7.b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild commit 903960442af7538786cd5d33e82fb6d0166af091 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Thu Feb 14 19:15:31 2013 -0600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index e7532f3..aa1d562 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.6.%{beta}%{?dist} +Release: 0.7.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.7.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.99-0.6.b2 - rebuild against new libjpeg commit a84b920d1f69ada06f4aa9604ba027fd419af108 Author: Adam Tkac <atkac(a)redhat.com> Date: Fri Dec 21 20:14:59 2012 +0100 rebuild against new libjpeg Signed-off-by: Adam Tkac <atkac(a)redhat.com> diff --git a/tachyon.spec b/tachyon.spec index d1f1669..e7532f3 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.5.%{beta}%{?dist} +Release: 0.6.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.99-0.6.b2 +- rebuild against new libjpeg + * Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.5.b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild commit f954557ecedde8c90cc0165f100c7353cfa27daa Author: Dennis Gilmore <dennis(a)ausil.us> Date: Sat Jul 21 17:42:50 2012 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index e9421b6..d1f1669 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.4.%{beta}%{?dist} +Release: 0.5.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.99-0.5.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Adam Jackson <ajax(a)redhat.com> 0.99-0.4.b2 - Fix invocation of rename(1) in %%install commit 94a772fe10b82a5c0cc2adbfda1161c6921cf356 Author: Adam Jackson <ajax(a)redhat.com> Date: Thu Jan 12 15:48:58 2012 -0500 Fix invocation of rename(1) in %install diff --git a/tachyon.spec b/tachyon.spec index 0753b83..e9421b6 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.3.%{beta}%{?dist} +Release: 0.4.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -102,7 +102,7 @@ mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tach for variant in %{variants} ; do install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant done -rename -thr "" $RPM_BUILD_ROOT%{_bindir}/* +rename -- -thr "" $RPM_BUILD_ROOT%{_bindir}/* mkdir docs/html %{__cp} -pr docs/tachyon/*.{css,html,png} docs/html %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Thu Jan 12 2012 Adam Jackson <ajax(a)redhat.com> 0.99-0.4.b2 +- Fix invocation of rename(1) in %%install + * Tue Dec 06 2011 Adam Jackson <ajax(a)redhat.com> - 0.99-0.3.b2 - Rebuild for new libpng commit cda207300d70970d946d03138b1dd14c5b60b75c Author: Adam Jackson <ajax(a)redhat.com> Date: Tue Dec 6 01:15:10 2011 -0500 Rebuild for new libpng diff --git a/tachyon.spec b/tachyon.spec index a0263fc..0753b83 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.2.%{beta}%{?dist} +Release: 0.3.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -140,6 +140,9 @@ install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/ta %{_datadir}/tachyon %changelog +* Tue Dec 06 2011 Adam Jackson <ajax(a)redhat.com> - 0.99-0.3.b2 +- Rebuild for new libpng + * Sat Jul 23 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.2.b2 - install missing tachyon_dep.h header - link shared library against libjpeg to avoid unresolved symbols commit d787aff37edecf96aadce15b14afba79773543e1 Author: Dominik Mierzejewski <dominik(a)greysector.net> Date: Sat Jul 23 20:29:49 2011 +0200 install missing tachyon_dep.h header link shared library against libjpeg to avoid unresolved symbols diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index d145c0c..befed75 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,6 +1,6 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch --- tachyon/unix/Make-arch.r 2011-02-18 19:19:55.000000000 +0100 -+++ tachyon/unix/Make-arch 2011-04-10 03:48:30.000000000 +0200 ++++ tachyon/unix/Make-arch 2011-07-23 20:16:02.000000000 +0200 @@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -36,27 +36,25 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1214,7 +1214,18 @@ linux-thr-ogl: +@@ -1214,7 +1214,7 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ - "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" \ -+ "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" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ +@@ -1225,7 +1225,7 @@ linux-64-thr-ogl: + $(MAKE) all \ + "ARCH = linux-64-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -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" \ -@@ -1284,25 +1295,37 @@ linux-beowulf-mpi: +@@ -1284,25 +1284,37 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ @@ -68,7 +66,8 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "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 +79,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + "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 @@ -104,7 +102,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch linux-mpi: $(MAKE) all \ -@@ -1340,16 +1363,16 @@ linux-mpi-64: +@@ -1340,16 +1352,16 @@ linux-mpi-64: # Linux AMD64/EM64T using LAM MPI, with OpenGL display @@ -129,7 +127,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch linux-lam-thr: diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config --- tachyon/unix/Make-config.r 2011-01-20 06:35:01.000000000 +0100 -+++ tachyon/unix/Make-config 2011-04-10 03:01:30.000000000 +0200 ++++ tachyon/unix/Make-config 2011-07-23 20:09:17.000000000 +0200 @@ -57,7 +57,7 @@ X11LIB= -lX11 ########################################################################## diff --git a/tachyon-shared.patch b/tachyon-shared.patch index 9af3741..a5d328d 100644 --- a/tachyon-shared.patch +++ b/tachyon-shared.patch @@ -1,6 +1,6 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile --- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 -+++ tachyon/unix/Makefile 2011-04-10 03:59:27.000000000 +0200 ++++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200 @@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon # # Name of raytracing library file to create @@ -20,7 +20,7 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile - rm -f ${RAYLIB} - ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} - ${RANLIB} ${RAYLIB} -+ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ++ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ${JPEGLIB} + ln -s lib${DIRNAME}.so $@ ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} diff --git a/tachyon.spec b/tachyon.spec index 715d330..a0263fc 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.1.%{beta}%{?dist} +Release: 0.2.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… @@ -109,7 +109,7 @@ mkdir docs/html install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 %{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ -install -pm644 src/{hash,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ +install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -140,6 +140,10 @@ install -pm644 src/{hash,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ %{_datadir}/tachyon %changelog +* Sat Jul 23 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.99-0.2.b2 +- install missing tachyon_dep.h header +- link shared library against libjpeg to avoid unresolved symbols + * Sun Apr 10 2011 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.99-0.1.b2 - updated to 0.99b2 - rebased patch commit 39d55bfe6e8810b3282201ea3a94fd05f4260047 Author: Dominik Mierzejewski <dominik(a)greysector.net> Date: Mon Apr 11 04:23:04 2011 +0200 Put beta tag before dist tag (no build). diff --git a/tachyon.spec b/tachyon.spec index 119ecf7..715d330 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -10,7 +10,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.99 -Release: 0.1%{?dist}%{beta} +Release: 0.1.%{beta}%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… commit 4bf908a8ed5cec77e0cbe88afd5243b2b77fb2ce Author: Dominik Mierzejewski <dominik(a)greysector.net> Date: Sun Apr 10 05:22:48 2011 +0200 Add missing file to sources. diff --git a/sources b/sources index b9add84..2357ffc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +6751ee2c59f8614ae693dba82e20cc73 tachyon-0.99b2.tar.gz 491604338614814996bfe54b6ad113d4 tachyon.1 commit 63836cfe90af857706b94112b00cd219b57e6d98 Author: Dominik Mierzejewski <dominik(a)greysector.net> Date: Sun Apr 10 05:14:45 2011 +0200 Upload missing manpage file. diff --git a/sources b/sources index 76551d8..b9add84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6751ee2c59f8614ae693dba82e20cc73 tachyon-0.99b2.tar.gz +491604338614814996bfe54b6ad113d4 tachyon.1 commit 37f845d3787f8c23e541448a045a0e328d5a3a87 Author: Dominik Mierzejewski <dominik(a)greysector.net> Date: Sun Apr 10 04:56:19 2011 +0200 - updated to 0.99b2 - rebased patch - updated BRs diff --git a/.gitignore b/.gitignore index 8d585d9..c4ca246 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tachyon-0.98.7.tar.gz tachyon.1 +/tachyon-0.99b2.tar.gz diff --git a/sources b/sources index 4fac635..76551d8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -491604338614814996bfe54b6ad113d4 tachyon.1 -eb39e10bb37bccc949b45b8fc28dabd7 tachyon-0.98.9.tar.gz +6751ee2c59f8614ae693dba82e20cc73 tachyon-0.99b2.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index 5e7671f..d145c0c 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,6 +1,6 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch ---- 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 +--- tachyon/unix/Make-arch.r 2011-02-18 19:19:55.000000000 +0100 ++++ tachyon/unix/Make-arch 2011-04-10 03:48:30.000000000 +0200 @@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -10,12 +10,12 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -1064,10 +1064,10 @@ linux-64-thr: +@@ -1103,10 +1103,10 @@ linux-64-thr: $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ -- "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)" \ +- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ @@ -23,7 +23,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1163,10 +1163,10 @@ linux-thr: +@@ -1202,10 +1202,10 @@ linux-thr: $(MAKE) all \ "ARCH = linux-thr" \ "CC = gcc" \ @@ -36,7 +36,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1175,7 +1175,18 @@ linux-thr-ogl: +@@ -1214,7 +1214,18 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ @@ -56,7 +56,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1209,25 +1220,37 @@ linux-beowulf-mpi: +@@ -1284,25 +1295,37 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ @@ -68,8 +68,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display @@ -81,7 +80,8 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" + "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 tachyon/unix/Make-arch $(MAKE) all \ - "ARCH = linux-lam-64" \ - "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -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 $(MISCFLAGS)" \ + "ARCH = linux-64-lam" \ + "CC = mpicc" \ + "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ @@ -104,7 +104,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch linux-mpi: $(MAKE) all \ -@@ -1255,16 +1278,16 @@ linux-mpi-64: +@@ -1340,16 +1363,16 @@ linux-mpi-64: # Linux AMD64/EM64T using LAM MPI, with OpenGL display @@ -113,7 +113,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch $(MAKE) all \ - "ARCH = linux-lam-64-ogl" \ - "CC = hcc" \ -- "CFLAGS = -m64 -Wall -O3 -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 -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)" \ @@ -128,8 +128,8 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch # Linux x86 using LAM MPI and threads linux-lam-thr: 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 2009-09-20 23:07:42.000000000 +0200 +--- tachyon/unix/Make-config.r 2011-01-20 06:35:01.000000000 +0100 ++++ tachyon/unix/Make-config 2011-04-10 03:01:30.000000000 +0200 @@ -57,7 +57,7 @@ X11LIB= -lX11 ########################################################################## @@ -192,17 +192,3 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ########################################################################## -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 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 - # --LINUX_GLX_INCS = -I/usr/X11R6/include --LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11 -+LINUX_GLX_INCS = -+LINUX_GLX_LIBS = -lGL -lGLU -lX11 - - - # diff --git a/tachyon-shared.patch b/tachyon-shared.patch index b0a8e18..9af3741 100644 --- a/tachyon-shared.patch +++ b/tachyon-shared.patch @@ -1,6 +1,6 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile ---- tachyon/unix/Makefile.shared 2009-04-23 17:11:55.000000000 +0200 -+++ tachyon/unix/Makefile 2009-12-26 14:48:12.000000000 +0100 +--- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100 ++++ tachyon/unix/Makefile 2011-04-10 03:59:27.000000000 +0200 @@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon # # Name of raytracing library file to create @@ -10,11 +10,11 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile RAYLIBDIR=${ARCHDIR} # -@@ -254,124 +254,125 @@ RAYOBJS= ${OBJDIR}/api.o \ +@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \ ${OBJDIR}/tgafile.o \ ${OBJDIR}/winbmp.o -+${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/rtcommon.h | cut -d\" -f 2) ++${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2) +${RAYLIB} : DIRNAME=tachyon-${VERSION} ${RAYLIB} : ${RAYOBJS} - rm -f ${RAYLIB} diff --git a/tachyon.spec b/tachyon.spec index 85b39e5..119ecf7 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -5,21 +5,22 @@ %endif %define variants thr thr-ogl +%define beta b2 Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon -Version: 0.98.9 -Release: 2%{?dist} +Version: 0.99 +Release: 0.1%{?dist}%{beta} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering -Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… +Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{… # taken from Debian package Source1: %{name}.1 Patch0: %{name}-rpm.patch Patch1: %{name}-shared.patch License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -BuildRequires: libGLU-devel +BuildRequires: libGL-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: latex2html @@ -108,7 +109,7 @@ mkdir docs/html install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 %{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ -install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ +install -pm644 src/{hash,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -139,6 +140,11 @@ install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/ %{_datadir}/tachyon %changelog +* Sun Apr 10 2011 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.99-0.1.b2 +- updated to 0.99b2 +- rebased patch +- updated BRs + * Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild commit 1b96b65af8a7f219b9e2a72577fb646930da3fb4 Merge: a038d8d ccc958a Author: Dominik Mierzejewski <rpm(a)greysector.net> Date: Sat Apr 9 20:44:55 2011 +0200 Merge remote branch 'origin/el6/master' Conflicts: .gitignore commit a038d8d931b986b03f3357fdacbcd94c5c5e33bb Merge: ccfe4f2 cf86cd2 Author: Dominik Mierzejewski <rpm(a)greysector.net> Date: Sat Apr 9 20:32:17 2011 +0200 Merge remote branch 'origin/f13/master' Conflicts: tachyon.spec commit ccfe4f2a415926b1519358f5579e06eb7596709b Author: Dennis Gilmore <dennis(a)ausil.us> Date: Wed Feb 9 11:55:26 2011 -0600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index d64f343..85b39e5 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -9,7 +9,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98.9 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… @@ -139,6 +139,9 @@ install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/ %{_datadir}/tachyon %changelog +* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Feb 09 2010 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.9-1 - update to 0.98.9 commit ccc958a1df6e690b574865adcde44e5acb4fcfd2 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Thu Jul 29 13:48:17 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c0301a5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: tachyon -# $Id$ -NAME := tachyon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 commit 3c532dae192b2b45ae8507ec2b934fed0ea2fc87 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Thu Jul 29 13:48:14 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5fd7f56..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: tachyon -# $Id: Makefile,v 1.1 2006/11/30 11:33:41 rathann Exp $ -NAME := tachyon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) commit cf86cd28301dc574e8e48ce37cfce31aef38534a Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Thu Jul 29 13:48:09 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c0301a5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: tachyon -# $Id$ -NAME := tachyon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 commit 6762e71ec5ab120aa17f59eb5b7d3ca73a40e787 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Sat May 8 02:24:52 2010 +0000 Initialize branch EL-6 for tachyon diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 commit f4c2242a5a6be2b0ee90e9e1292e61e562f96e8b Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Wed Feb 17 03:17:38 2010 +0000 Initialize branch F-13 for tachyon diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 commit 44bd1369e95eea7f8802948a5e6d354480fd310e Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sun Feb 14 18:09:42 2010 +0000 - update to 0.98.9 diff --git a/.cvsignore b/.cvsignore index 8d585d9..198b593 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -tachyon-0.98.7.tar.gz tachyon.1 +tachyon-0.98.9.tar.gz diff --git a/sources b/sources index 9b3452e..4fac635 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -17b41c7042a2d3a75531a4979f643d15 tachyon-0.98.7.tar.gz 491604338614814996bfe54b6ad113d4 tachyon.1 +eb39e10bb37bccc949b45b8fc28dabd7 tachyon-0.98.9.tar.gz diff --git a/tachyon.spec b/tachyon.spec index 8162aec..d64f343 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -8,8 +8,8 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon -Version: 0.98.7 -Release: 2%{?dist} +Version: 0.98.9 +Release: 1%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… @@ -139,6 +139,9 @@ install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/ %{_datadir}/tachyon %changelog +* Tue Feb 09 2010 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.9-1 +- update to 0.98.9 + * Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 - drop LAM support - add shared library (based on Debian patch) commit b315c60c18175d18752cafe6e54b9871d549424b Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sun Feb 14 18:09:42 2010 +0000 - update to 0.98.9 diff --git a/.cvsignore b/.cvsignore index 8d585d9..198b593 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -tachyon-0.98.7.tar.gz tachyon.1 +tachyon-0.98.9.tar.gz diff --git a/sources b/sources index 9b3452e..4fac635 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -17b41c7042a2d3a75531a4979f643d15 tachyon-0.98.7.tar.gz 491604338614814996bfe54b6ad113d4 tachyon.1 +eb39e10bb37bccc949b45b8fc28dabd7 tachyon-0.98.9.tar.gz diff --git a/tachyon.spec b/tachyon.spec index 8162aec..d64f343 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -8,8 +8,8 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon -Version: 0.98.7 -Release: 2%{?dist} +Version: 0.98.9 +Release: 1%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… @@ -139,6 +139,9 @@ install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/ %{_datadir}/tachyon %changelog +* Tue Feb 09 2010 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.9-1 +- update to 0.98.9 + * Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 - drop LAM support - add shared library (based on Debian patch) commit 1618436047b4f2e4c7b67c76e893a7d91e75153b Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sat Dec 26 14:25:13 2009 +0000 - drop LAM support - add shared library (based on Debian patch) - simplify some specfile constructs - improve descriptions diff --git a/tachyon-shared.patch b/tachyon-shared.patch new file mode 100644 index 0000000..b0a8e18 --- /dev/null +++ b/tachyon-shared.patch @@ -0,0 +1,179 @@ +diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile +--- tachyon/unix/Makefile.shared 2009-04-23 17:11:55.000000000 +0200 ++++ tachyon/unix/Makefile 2009-12-26 14:48:12.000000000 +0100 +@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon + # + # Name of raytracing library file to create + # +-RAYLIB=${ARCHDIR}/libtachyon.a ++RAYLIB=${ARCHDIR}/libtachyon.so + RAYLIBDIR=${ARCHDIR} + + # +@@ -254,124 +254,125 @@ RAYOBJS= ${OBJDIR}/api.o \ + ${OBJDIR}/tgafile.o \ + ${OBJDIR}/winbmp.o + ++${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/rtcommon.h | cut -d\" -f 2) ++${RAYLIB} : DIRNAME=tachyon-${VERSION} + ${RAYLIB} : ${RAYOBJS} +- rm -f ${RAYLIB} +- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} +- ${RANLIB} ${RAYLIB} ++ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ++ ln -s lib${DIRNAME}.so $@ + + ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o + + ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o + + ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o + + ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o + + ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o + + ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o + + ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o + + ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o + + ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o + + ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o + + ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o + + ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o + + ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o + + ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o + + ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o + + ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o + + ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o + + ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o + + ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o + + ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o + + ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o + + ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o + + ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o + + ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o + + ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o + + ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o + + ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o + + ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o + + ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o + + ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o + + ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o + + ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o + + ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o + + ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o + + ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o + + ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o + + ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o + + ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o + + clean : + @echo "Cleaning object files, binaries etc." diff --git a/tachyon.spec b/tachyon.spec index 35ab3b0..8162aec 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -1,43 +1,47 @@ -%ifarch %{ix86} alpha ppc sparc -%define target linux -%endif -%ifarch ppc64 sparc64 x86_64 +%ifarch alpha ppc64 sparc64 x86_64 %define target linux-64 +%else +%define target linux %endif %define variants thr thr-ogl -%define mpi_variants lam lam-ogl Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98.7 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… # taken from Debian package Source1: %{name}.1 Patch0: %{name}-rpm.patch +Patch1: %{name}-shared.patch License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -BuildRequires: environment-modules BuildRequires: libGLU-devel 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 -and multithreaded implementations. Tachyon is built as a C callable +A portable, high performance parallel ray tracing system with +multithreaded implementation. + +%package libs +Summary: Parallel / Multiprocessor Ray Tracing System library +Group: System Environment/Libraries + +%description libs +A portable, high performance parallel ray tracing system with +multithreaded implementation. Tachyon is built as a C callable library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. +your own application. -This package contains pthread build. +This package contains the shared library. %package gl Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display @@ -45,41 +49,19 @@ Group: Applications/Engineering Provides: %{name} = %{version}-%{release} %description gl -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. +A portable, high performance parallel ray tracing system with +multithreaded implementation. -This package contains pthread build with OpenGL display. +This package contains OpenGL-enabled build. -%package lam -Summary: Parallel / Multiprocessor Ray Tracing System -Group: Applications/Engineering -Provides: %{name} = %{version}-%{release} - -%description lam -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. - -This package contains LAM build. +%package devel +Summary: Development files for tachyon +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} -%package lam-gl -Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display -Group: Applications/Engineering -Provides: %{name} = %{version}-%{release} - -%description lam-gl -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. - -This package contains LAM build with OpenGL display. +%description devel +This package contains development headers and libraries for developing +with tachyon. %package docs Summary: Documentation and example scenes for tachyon @@ -93,6 +75,7 @@ with tachyon. %prep %setup -q -n %{name} %patch0 -p1 -b .r +%patch1 -p1 -b .shared find . -name CVS | xargs %{__rm} -r # executable sources chmod 644 src/hash.{c,h} @@ -106,11 +89,6 @@ 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 @@ -119,38 +97,41 @@ popd %install %{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon,%{_mandir}/man1} -for variant in %{variants} %{mpi_variants} ; do +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1} +for variant in %{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 +mkdir docs/html +%{__cp} -pr docs/tachyon/*.{css,html,png} docs/html %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ +echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 +%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ +install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Copyright README %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -%files gl +%files libs %defattr(644,root,root,755) %doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-ogl +%{_libdir}/libtachyon-%{version}.so -%files lam +%files gl %defattr(644,root,root,755) -%doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-lam +%attr(755,root,root) %{_bindir}/%{name}-ogl +%{_mandir}/man1/%{name}-ogl.1* -%files lam-gl +%files devel %defattr(644,root,root,755) -%doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-lam-ogl +%{_includedir}/tachyon +%{_libdir}/libtachyon.so %files docs %defattr(644,root,root,755) @@ -158,6 +139,12 @@ install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ %{_datadir}/tachyon %changelog +* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 +- drop LAM support +- add shared library (based on Debian patch) +- simplify some specfile constructs +- improve descriptions + * Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-1 - update to 0.98.7 release - simplify specfile ifdeffery and reduce patch size commit 4b1d60db13d24c42272342774ac830c646b37071 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sat Dec 26 14:25:13 2009 +0000 - drop LAM support - add shared library (based on Debian patch) - simplify some specfile constructs - improve descriptions diff --git a/tachyon-shared.patch b/tachyon-shared.patch new file mode 100644 index 0000000..b0a8e18 --- /dev/null +++ b/tachyon-shared.patch @@ -0,0 +1,179 @@ +diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile +--- tachyon/unix/Makefile.shared 2009-04-23 17:11:55.000000000 +0200 ++++ tachyon/unix/Makefile 2009-12-26 14:48:12.000000000 +0100 +@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon + # + # Name of raytracing library file to create + # +-RAYLIB=${ARCHDIR}/libtachyon.a ++RAYLIB=${ARCHDIR}/libtachyon.so + RAYLIBDIR=${ARCHDIR} + + # +@@ -254,124 +254,125 @@ RAYOBJS= ${OBJDIR}/api.o \ + ${OBJDIR}/tgafile.o \ + ${OBJDIR}/winbmp.o + ++${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/rtcommon.h | cut -d\" -f 2) ++${RAYLIB} : DIRNAME=tachyon-${VERSION} + ${RAYLIB} : ${RAYOBJS} +- rm -f ${RAYLIB} +- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS} +- ${RANLIB} ${RAYLIB} ++ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ++ ln -s lib${DIRNAME}.so $@ + + ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o + + ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o + + ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o + + ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o + + ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o + + ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o + + ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o + + ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o + + ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o + + ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o + + ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o + + ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o + + ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o + + ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o + + ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o + + ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o + + ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o + + ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o + + ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o + + ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o + + ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o + + ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o + + ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o + + ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o + + ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o + + ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o + + ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o + + ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o + + ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o + + ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o + + ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o + + ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o + + ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o + + ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o + + ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o + + ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o + + ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS} +- ${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o + + ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h +- ${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o ++ ${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o + + clean : + @echo "Cleaning object files, binaries etc." diff --git a/tachyon.spec b/tachyon.spec index 35ab3b0..8162aec 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -1,43 +1,47 @@ -%ifarch %{ix86} alpha ppc sparc -%define target linux -%endif -%ifarch ppc64 sparc64 x86_64 +%ifarch alpha ppc64 sparc64 x86_64 %define target linux-64 +%else +%define target linux %endif %define variants thr thr-ogl -%define mpi_variants lam lam-ogl Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98.7 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… # taken from Debian package Source1: %{name}.1 Patch0: %{name}-rpm.patch +Patch1: %{name}-shared.patch License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -BuildRequires: environment-modules BuildRequires: libGLU-devel 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 -and multithreaded implementations. Tachyon is built as a C callable +A portable, high performance parallel ray tracing system with +multithreaded implementation. + +%package libs +Summary: Parallel / Multiprocessor Ray Tracing System library +Group: System Environment/Libraries + +%description libs +A portable, high performance parallel ray tracing system with +multithreaded implementation. Tachyon is built as a C callable library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. +your own application. -This package contains pthread build. +This package contains the shared library. %package gl Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display @@ -45,41 +49,19 @@ Group: Applications/Engineering Provides: %{name} = %{version}-%{release} %description gl -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. +A portable, high performance parallel ray tracing system with +multithreaded implementation. -This package contains pthread build with OpenGL display. +This package contains OpenGL-enabled build. -%package lam -Summary: Parallel / Multiprocessor Ray Tracing System -Group: Applications/Engineering -Provides: %{name} = %{version}-%{release} - -%description lam -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. - -This package contains LAM build. +%package devel +Summary: Development files for tachyon +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} -%package lam-gl -Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display -Group: Applications/Engineering -Provides: %{name} = %{version}-%{release} - -%description lam-gl -A portable, high performance parallel ray tracing system supporting MPI -and multithreaded implementations. Tachyon is built as a C callable -library, which can be used with the included demo programs or within -your own application. The distribution also includes a simple scene -file parser front-end which reads a few different formats. - -This package contains LAM build with OpenGL display. +%description devel +This package contains development headers and libraries for developing +with tachyon. %package docs Summary: Documentation and example scenes for tachyon @@ -93,6 +75,7 @@ with tachyon. %prep %setup -q -n %{name} %patch0 -p1 -b .r +%patch1 -p1 -b .shared find . -name CVS | xargs %{__rm} -r # executable sources chmod 644 src/hash.{c,h} @@ -106,11 +89,6 @@ 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 @@ -119,38 +97,41 @@ popd %install %{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon,%{_mandir}/man1} -for variant in %{variants} %{mpi_variants} ; do +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1} +for variant in %{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 +mkdir docs/html +%{__cp} -pr docs/tachyon/*.{css,html,png} docs/html %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ +echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1 +%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/ +install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/ %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Copyright README %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -%files gl +%files libs %defattr(644,root,root,755) %doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-ogl +%{_libdir}/libtachyon-%{version}.so -%files lam +%files gl %defattr(644,root,root,755) -%doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-lam +%attr(755,root,root) %{_bindir}/%{name}-ogl +%{_mandir}/man1/%{name}-ogl.1* -%files lam-gl +%files devel %defattr(644,root,root,755) -%doc Copyright README -%attr(755,root,root) %{_bindir}/%{name}-lam-ogl +%{_includedir}/tachyon +%{_libdir}/libtachyon.so %files docs %defattr(644,root,root,755) @@ -158,6 +139,12 @@ install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ %{_datadir}/tachyon %changelog +* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-2 +- drop LAM support +- add shared library (based on Debian patch) +- simplify some specfile constructs +- improve descriptions + * Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.7-1 - update to 0.98.7 release - simplify specfile ifdeffery and reduce patch size commit 0c3f7802ab776c840916c1c3c1a7b883a68f74ab Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:25:07 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 6435c67..c0301a5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := tachyon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 9f50399aee385db7a2a92dd9bef8b7e31a54ffa8 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Wed Nov 25 22:52:16 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 6435c67..5fd7f56 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: tachyon -# $Id$ +# $Id: Makefile,v 1.1 2006/11/30 11:33:41 rathann Exp $ NAME := tachyon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 584c4b854d1c2aeda6303fc19963a777f655d4e7 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Wed Nov 25 22:52:16 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 6435c67..c0301a5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := tachyon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit ce19d89eb99697b36f64fec31d41c7b86ca792c7 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Mon Sep 21 00:33:59 2009 +0000 - update to 0.98.7 release - simplify specfile ifdeffery and reduce patch size - fix build with new environment-modules - add manpage from Debian package diff --git a/.cvsignore b/.cvsignore index d304b22..8d585d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -tachyon-0.98.1.tar.gz +tachyon-0.98.7.tar.gz +tachyon.1 diff --git a/sources b/sources index 6deb7e4..9b3452e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -8f8e7b491b2517319cb4f5596c952a0b tachyon-0.98.1.tar.gz +17b41c7042a2d3a75531a4979f643d15 tachyon-0.98.7.tar.gz +491604338614814996bfe54b6ad113d4 tachyon.1 diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index 17999e7..5e7671f 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch + $(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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch + "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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch $(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 tachyon/unix/Make-arch # 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 tachyon/unix/Make-config ########################################################################## 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 diff --git a/tachyon.spec b/tachyon.spec index 8ebc6e3..35ab3b0 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -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… +Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… +# 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(a)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(a)lists.fedoraproject.org> - 0.98.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild commit b9175d6d731399c942fd6c5d716cf778c16b2f25 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Mon Jul 27 05:28:52 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index 5ed49a3..8ebc6e3 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -13,7 +13,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version… @@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98.1-1 - update to 0.98.1 release - fix mixed-up summaries commit 192cd35afb34e1e944958794b84d5c6160a279bf Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sat Feb 28 17:46:04 2009 +0000 - update to 0.98.1 release - fix mixed-up summaries - docs are now built separately diff --git a/.cvsignore b/.cvsignore index a62ce34..d304b22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tachyon20070319.tar.gz +tachyon-0.98.1.tar.gz diff --git a/sources b/sources index 1e929f9..6deb7e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef6fea54ef5222ed0b5335e2e6a76c11 tachyon20070319.tar.gz +8f8e7b491b2517319cb4f5596c952a0b tachyon-0.98.1.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index 602e9ac..17999e7 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch 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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch - "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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch - "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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch # 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 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch 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-config.r tachyon/unix/Make-config ########################################################################## 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 diff --git a/tachyon.spec b/tachyon.spec index 3bc16fa..5ed49a3 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -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… Patch0: %{name}-rpm.patch License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +25,10 @@ BuildRequires: libGLU-devel 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 @@ file parser front-end which reads a few different formats. 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 @@ file parser front-end which reads a few different formats. 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 @@ with tachyon. %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 @@ for variant in %{variants} ; do 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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sat Feb 28 2009 Dominik 'Rathann' Mierzejewski <rpm(a)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(a)lists.fedoraproject.org> - 0.98-0.8.20070319 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild commit 3baaf727fa0547328a34bb22b81e449f17caf4e5 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Wed Feb 25 18:17:06 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/tachyon.spec b/tachyon.spec index b222097..3bc16fa 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -13,7 +13,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.7.20070319%{?dist} +Release: 0.8.20070319%{?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 @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98-0.8.20070319 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.7.20070319 - fix build with new lam package - use generic BR for libGLU-devel commit 0d2e5f5c43f4744fa5dc3c8075188eb6b6806d50 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Fri Sep 26 17:42:37 2008 +0000 - fix build with new lam package - use generic BR for libGLU-devel - move tree cleanup to %prep to fix short-circuit builds diff --git a/tachyon.spec b/tachyon.spec index 809058b..b222097 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -13,14 +13,15 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.6.20070319%{?dist} +Release: 0.7.20070319%{?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 Patch0: %{name}-rpm.patch License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -BuildRequires: mesa-libGLU-devel +BuildRequires: environment-modules +BuildRequires: libGLU-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: lam-devel @@ -92,8 +93,11 @@ find . -name CVS | xargs %{__rm} -rf chmod 644 src/hash.* chmod 644 demosrc/trackball.c chmod 644 scenes/imaps/* +%{__rm} docs/tachyon/images.idx %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 @@ -107,7 +111,6 @@ for variant in %{variants} ; do install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant done rename -thr "" $RPM_BUILD_ROOT%{_bindir}/* -%{__rm} docs/tachyon/images.idx %{__mv} docs/tachyon docs/html %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ @@ -140,6 +143,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.7.20070319 +- fix build with new lam package +- use generic BR for libGLU-devel +- move tree cleanup to %%prep to fix short-circuit builds + * Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.98-0.6.20070319 - Autorebuild for GCC 4.3 commit 2c8af4adec31a7c538ceeb2f9039e93b35205326 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Tue Feb 19 20:52:48 2008 +0000 - Autorebuild for GCC 4.3 diff --git a/tachyon.spec b/tachyon.spec index 84f3475..809058b 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -13,7 +13,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.5.20070319%{?dist} +Release: 0.6.20070319%{?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 @@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.98-0.6.20070319 +- Autorebuild for GCC 4.3 + * Thu Dec 13 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.5 - more seamless variant handling - use proper lam cflags and ldflags (as reported by pkgconfig) commit d87e0a777e0669d733a5991312fd31e683551e5c Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Thu Dec 13 21:13:36 2007 +0000 - more seamless variant handling - use proper lam cflags and ldflags (as reported by pkgconfig) diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index ef37af9..602e9ac 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -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-04 00:01:04.000000000 +0100 ++++ tachyon/unix/Make-arch 2007-12-13 22:08:06.000000000 +0100 @@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -63,33 +63,33 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1174,37 +1174,61 @@ linux-beowulf-mpi: +@@ -1174,44 +1174,68 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ - "CC = hcc" \ - "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ + "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display +linux-lam-ogl: + $(MAKE) all \ + "ARCH = linux-lam-ogl" \ + "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ "RANLIB = ranlib" \ - "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI -linux-lam-64: @@ -100,14 +100,14 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch - "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ + "ARCH = linux-64-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ "RANLIB = ranlib" \ - "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI, with OpenGL display -linux-lam-64-ogl: @@ -118,14 +118,14 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch - "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 -I$(LAMHOME)/h -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" \ + "STRIP = touch" \ "RANLIB = ranlib" \ - "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" -+ "LIBS = -L. -L$(LAMHOME) -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: @@ -141,6 +141,14 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch # 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: "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" @@ -174,24 +182,24 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-ppc-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux PPC64 using gcc +linux-ppc64: @@ -234,24 +242,24 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-ppc64-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux SPARC using gcc +linux-sparc: @@ -294,24 +302,24 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-sparc-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux SPARC64 using gcc +linux-sparc64: @@ -354,24 +362,24 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-sparc64-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + # Linux PPC using gcc linux-ps2: @@ -417,31 +425,31 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch + $(MAKE) all \ + "ARCH = linux-alpha-lam" \ + "CC = mpicc" \ -+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ "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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ + "RANLIB = ranlib" \ -+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "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:35:44.000000000 +0100 -+++ tachyon/unix/Make-config 2007-12-03 23:57:46.000000000 +0100 ++++ tachyon/unix/Make-config 2007-12-13 22:08:20.000000000 +0100 @@ -57,7 +57,7 @@ X11LIB= -lX11 ########################################################################## @@ -451,7 +459,18 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config # UMR CS Dept #MPIDIR=/software/all/mpi -@@ -108,14 +108,14 @@ MBOX= +@@ -68,6 +68,10 @@ MPIDIR=/usr/local/mpi + # Cornell Theory Center SP-2 splogin.tc.cornell.edu + #MPIDIR=/usr/local/app/mpich + ++# LAM ++LAMFLAGS=`pkg-config --cflags lam` ++LAMLIBS=`pkg-config --libs lam` ++ + + ########################################################################## + # Floating point configuration: +@@ -108,14 +112,14 @@ MBOX= # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -472,7 +491,7 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ########################################################################## -@@ -128,14 +128,14 @@ JPEGLIB= +@@ -128,14 +132,14 @@ JPEGLIB= # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support @@ -495,7 +514,7 @@ diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config ########################################################################## 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-03 23:57:46.000000000 +0100 ++++ tachyon/unix/Make-opengl 2007-12-13 21:54:04.000000000 +0100 @@ -9,8 +9,8 @@ # # Generic Mesa OpenGL / GLX include and link specs, for most platforms diff --git a/tachyon.spec b/tachyon.spec index 7fc564b..84f3475 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -8,10 +8,12 @@ %define target linux-%{_target_cpu} %endif +%define variants thr thr-ogl lam lam-ogl + Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.4.20070319%{?dist} +Release: 0.5.20070319%{?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 @@ -93,17 +95,16 @@ chmod 644 scenes/imaps/* %build pushd unix -%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr -%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl -%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam -%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl +for variant in %{variants} ; do + %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant +done popd %install %{__rm} -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon} -for variant in -thr -thr-ogl -lam -lam-ogl ; do - install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant +for variant in %{variants} ; do + install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant done rename -thr "" $RPM_BUILD_ROOT%{_bindir}/* %{__rm} docs/tachyon/images.idx @@ -139,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Thu Dec 13 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.5 +- more seamless variant handling +- use proper lam cflags and ldflags (as reported by pkgconfig) + * Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.4 - add support for Alpha commit 377ce78106ac440cdd7ced404cf32f36dede6c2f Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Mon Dec 3 23:05:02 2007 +0000 - add support for Alpha diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index ed18607..ef37af9 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,6 +1,7 @@ +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-07-14 14:22:32.000000000 +0200 -@@ -15,7 +15,7 @@ ++++ tachyon/unix/Make-arch 2007-12-04 00:01:04.000000000 +0100 +@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) @@ -9,7 +10,7 @@ MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -983,7 +983,7 @@ +@@ -983,7 +983,7 @@ linux: "CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -18,7 +19,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -1007,7 +1007,7 @@ +@@ -1007,7 +1007,7 @@ linux-64: "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -27,7 +28,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -1029,10 +1029,10 @@ +@@ -1029,10 +1029,10 @@ linux-64-thr: $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ @@ -40,7 +41,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1128,10 +1128,10 @@ +@@ -1128,10 +1128,10 @@ linux-thr: $(MAKE) all \ "ARCH = linux-thr" \ "CC = gcc" \ @@ -53,7 +54,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1140,7 +1140,7 @@ +@@ -1140,7 +1140,7 @@ linux-thr-ogl: $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ @@ -62,7 +63,7 @@ "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1174,37 +1174,61 @@ +@@ -1174,37 +1174,61 @@ linux-beowulf-mpi: linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ @@ -74,8 +75,7 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display @@ -87,7 +87,8 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI @@ -122,7 +123,8 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux AMD64/EM64T using threads with OpenGL display @@ -134,13 +136,12 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" # Linux x86 using LAM MPI and threads linux-lam-thr: -@@ -1242,6 +1266,234 @@ +@@ -1242,6 +1266,234 @@ linux-ppc: "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" @@ -375,9 +376,73 @@ # Linux PPC using gcc linux-ps2: $(MAKE) all \ +@@ -1259,13 +1511,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 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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:35:44.000000000 +0100 -+++ tachyon/unix/Make-config 2007-07-14 14:18:14.000000000 +0200 -@@ -57,7 +57,7 @@ ++++ tachyon/unix/Make-config 2007-12-03 23:57:46.000000000 +0100 +@@ -57,7 +57,7 @@ X11LIB= -lX11 ########################################################################## # Standard MPICH installation location @@ -386,7 +451,7 @@ # UMR CS Dept #MPIDIR=/software/all/mpi -@@ -108,14 +108,14 @@ +@@ -108,14 +108,14 @@ MBOX= # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -407,7 +472,7 @@ ########################################################################## -@@ -128,14 +128,14 @@ +@@ -128,14 +128,14 @@ JPEGLIB= # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support @@ -428,8 +493,9 @@ ########################################################################## +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-07-14 14:18:14.000000000 +0200 ++++ tachyon/unix/Make-opengl 2007-12-03 23:57:46.000000000 +0100 @@ -9,8 +9,8 @@ # # Generic Mesa OpenGL / GLX include and link specs, for most platforms @@ -441,7 +507,7 @@ # -@@ -37,8 +37,8 @@ +@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr # # Linux OpenGL / GLX include and link specs # diff --git a/tachyon.spec b/tachyon.spec index c9918da..7fc564b 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -4,14 +4,14 @@ %ifarch x86_64 %define target linux-64 %endif -%ifarch ppc ppc64 sparc sparc64 +%ifarch ppc ppc64 sparc sparc64 alpha %define target linux-%{_target_cpu} %endif Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.3.20070319%{?dist} +Release: 0.4.20070319%{?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 @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.4 +- add support for Alpha + * Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.3 - rebuild - update license tag commit e0198e1976d4d4d245bf6c4314251c5d037b62b8 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Tue Aug 28 23:41:33 2007 +0000 - rebuild - update license tag diff --git a/tachyon.spec b/tachyon.spec index f1142e5..c9918da 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -11,12 +11,12 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.2.20070319%{?dist} +Release: 0.3.20070319%{?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 Patch0: %{name}-rpm.patch -License: BSD +License: BSD with advertising BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: mesa-libGLU-devel BuildRequires: libpng-devel @@ -139,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.3 +- rebuild +- update license tag + * Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.2 - add support for ppc64 and sparc64, simplify target setting commit d499ab86c5201b8fe927306efa1e31c955dc23c5 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sat Jul 14 12:25:07 2007 +0000 - add support for ppc64 and sparc64, simplify target setting diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index 6688754..ed18607 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,5 +1,5 @@ ---- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100 -+++ tachyon/unix/Make-arch 2006-12-17 00:42:01.000000000 +0100 +--- tachyon/unix/Make-arch.r 2007-02-13 10:00:36.000000000 +0100 ++++ tachyon/unix/Make-arch 2007-07-14 14:22:32.000000000 +0200 @@ -15,7 +15,7 @@ MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -9,7 +9,7 @@ MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) default: -@@ -915,7 +915,7 @@ +@@ -983,7 +983,7 @@ "CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -18,7 +18,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -927,7 +927,7 @@ +@@ -1007,7 +1007,7 @@ "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \ "AR = ar" \ "ARFLAGS = r" \ @@ -27,7 +27,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" -@@ -936,10 +936,10 @@ +@@ -1029,10 +1029,10 @@ $(MAKE) all \ "ARCH = linux-64-thr" \ "CC = gcc" \ @@ -40,7 +40,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1035,10 +1035,10 @@ +@@ -1128,10 +1128,10 @@ $(MAKE) all \ "ARCH = linux-thr" \ "CC = gcc" \ @@ -53,7 +53,7 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -@@ -1047,7 +1047,7 @@ +@@ -1140,7 +1140,7 @@ $(MAKE) all \ "ARCH = linux-thr-ogl" \ "CC = cc" \ @@ -62,7 +62,7 @@ "AR = ar" \ "ARFLAGS = r" \ "STRIP = touch" \ -@@ -1081,37 +1081,61 @@ +@@ -1174,37 +1174,61 @@ linux-lam: $(MAKE) all \ "ARCH = linux-lam" \ @@ -122,8 +122,7 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux AMD64/EM64T using threads with OpenGL display @@ -135,12 +134,13 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" # Linux x86 using LAM MPI and threads linux-lam-thr: -@@ -1149,6 +1173,114 @@ +@@ -1242,6 +1266,234 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" @@ -192,6 +192,66 @@ + "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ +# Linux SPARC using gcc +linux-sparc: + $(MAKE) all \ @@ -251,12 +311,72 @@ + "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + # Linux PPC using gcc linux-ps2: $(MAKE) all \ ---- tachyon/unix/Make-config.r 2004-03-05 20:41:03.000000000 +0100 -+++ tachyon/unix/Make-config 2006-12-17 00:37:45.000000000 +0100 +--- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100 ++++ tachyon/unix/Make-config 2007-07-14 14:18:14.000000000 +0200 @@ -57,7 +57,7 @@ ########################################################################## @@ -308,8 +428,8 @@ ########################################################################## ---- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100 -+++ tachyon/unix/Make-opengl 2006-12-17 00:37:45.000000000 +0100 +--- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100 ++++ tachyon/unix/Make-opengl 2007-07-14 14:18:14.000000000 +0200 @@ -9,8 +9,8 @@ # # Generic Mesa OpenGL / GLX include and link specs, for most platforms diff --git a/tachyon.spec b/tachyon.spec index a404aea..f1142e5 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -4,17 +4,14 @@ %ifarch x86_64 %define target linux-64 %endif -%ifarch ppc -%define target linux-ppc -%endif -%ifarch sparc -%define target linux-sparc +%ifarch ppc ppc64 sparc sparc64 +%define target linux-%{_target_cpu} %endif Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.98 -Release: 0.1%{?dist} +Release: 0.2.20070319%{?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 @@ -142,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.2 +- add support for ppc64 and sparc64, simplify target setting + * Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.1 - update to 0.98 pre-release commit ed5103f4b93836d2b33fb0299c394e82bf7ab031 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sat Jul 7 22:41:23 2007 +0000 - update to 0.98 pre-release diff --git a/.cvsignore b/.cvsignore index ff978e3..a62ce34 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tachyon-0.97.tar.gz +tachyon20070319.tar.gz diff --git a/sources b/sources index 4937532..1e929f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -198953aea283a7158eef2ee079e909f6 tachyon-0.97.tar.gz +ef6fea54ef5222ed0b5335e2e6a76c11 tachyon20070319.tar.gz diff --git a/tachyon.spec b/tachyon.spec index f0c6bae..a404aea 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -13,11 +13,11 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon -Version: 0.97 -Release: 4%{?dist} +Version: 0.98 +Release: 0.1%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering -Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz +Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98/tachyon20070319.tar.gz Patch0: %{name}-rpm.patch License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.98-0.1 +- update to 0.98 pre-release + * Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-4 - fix copy&paste error in patch commit e08b3b0e4848cd85f973f5d37c492e310226cb5b Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sun Dec 17 01:36:38 2006 +0000 - fix copy&paste error in patch diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index ef0e3b8..6688754 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -205,7 +205,7 @@ + "LIBS = -L. -ltachyon $(MISCLIB) -lm" + +# Linux SPARC using gcc and threads -+linux-ppc-thr: ++linux-sparc-thr: + $(MAKE) all \ + "ARCH = linux-sparc-thr" \ + "CC = gcc" \ @@ -217,7 +217,7 @@ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + +# Linux SPARC using threads with OpenGL display -+linux-ppc-thr-ogl: ++linux-sparc-thr-ogl: + $(MAKE) all \ + "ARCH = linux-sparc-thr-ogl" \ + "CC = gcc" \ diff --git a/tachyon.spec b/tachyon.spec index e91bb1f..f0c6bae 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -14,7 +14,7 @@ Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.97 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-4 +- fix copy&paste error in patch + * Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-3 - add SPARC support commit 54a0945477d2d8ed5a4035b0865fcbfd42b4c033 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Sun Dec 17 00:45:59 2006 +0000 - add SPARC support diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch index d1aacb4..ef0e3b8 100644 --- a/tachyon-rpm.patch +++ b/tachyon-rpm.patch @@ -1,5 +1,5 @@ --- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100 -+++ tachyon/unix/Make-arch 2006-11-29 19:54:45.000000000 +0100 ++++ tachyon/unix/Make-arch 2006-12-17 00:42:01.000000000 +0100 @@ -15,7 +15,7 @@ MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) @@ -74,7 +74,8 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" + +# Linux x86 using LAM MPI, with OpenGL display @@ -86,8 +87,7 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" # Linux AMD64/EM64T using LAM MPI @@ -122,7 +122,8 @@ "ARFLAGS = r" \ - "STRIP = strip" \ + "STRIP = touch" \ -+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + +# Linux AMD64/EM64T using threads with OpenGL display @@ -134,13 +135,12 @@ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = touch" \ - "RANLIB = ranlib" \ -- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" # Linux x86 using LAM MPI and threads linux-lam-thr: -@@ -1149,6 +1173,54 @@ +@@ -1149,6 +1173,114 @@ "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm" @@ -168,7 +168,7 @@ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" + -+# Linux AMD64/EM64T using LAM MPI ++# Linux PPC using LAM MPI +linux-ppc-lam: + $(MAKE) all \ + "ARCH = linux-ppc-lam" \ @@ -180,7 +180,7 @@ + "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" + -+# Linux AMD64/EM64T using LAM MPI, with OpenGL display ++# Linux PPC using LAM MPI, with OpenGL display +linux-ppc-lam-ogl: + $(MAKE) all \ + "ARCH = linux-ppc-lam-ogl" \ @@ -191,12 +191,72 @@ + "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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-ppc-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-ppc-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 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + # Linux PPC using gcc linux-ps2: $(MAKE) all \ --- tachyon/unix/Make-config.r 2004-03-05 20:41:03.000000000 +0100 -+++ tachyon/unix/Make-config 2006-11-29 19:51:01.000000000 +0100 ++++ tachyon/unix/Make-config 2006-12-17 00:37:45.000000000 +0100 @@ -57,7 +57,7 @@ ########################################################################## @@ -249,7 +309,7 @@ ########################################################################## --- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100 -+++ tachyon/unix/Make-opengl 2006-11-29 19:51:01.000000000 +0100 ++++ tachyon/unix/Make-opengl 2006-12-17 00:37:45.000000000 +0100 @@ -9,8 +9,8 @@ # # Generic Mesa OpenGL / GLX include and link specs, for most platforms diff --git a/tachyon.spec b/tachyon.spec index 377032c..e91bb1f 100644 --- a/tachyon.spec +++ b/tachyon.spec @@ -7,11 +7,14 @@ %ifarch ppc %define target linux-ppc %endif +%ifarch sparc +%define target linux-sparc +%endif Summary: Parallel / Multiprocessor Ray Tracing System Name: tachyon Version: 0.97 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ Group: Applications/Engineering Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz @@ -139,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/tachyon %changelog +* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-3 +- add SPARC support + * Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-2 - use only kosher CFLAGS - fix target setting commit 9199ae589f20b1506a543dbdd4bfd6182568a807 Author: Dominik Mierzejewski <rathann(a)fedoraproject.org> Date: Thu Nov 30 11:52:52 2006 +0000 auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm diff --git a/.cvsignore b/.cvsignore index e69de29..ff978e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tachyon-0.97.tar.gz diff --git a/sources b/sources index e69de29..4937532 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +198953aea283a7158eef2ee079e909f6 tachyon-0.97.tar.gz diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch new file mode 100644 index 0000000..d1aacb4 --- /dev/null +++ b/tachyon-rpm.patch @@ -0,0 +1,274 @@ +--- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100 ++++ tachyon/unix/Make-arch 2006-11-29 19:54:45.000000000 +0100 +@@ -15,7 +15,7 @@ + + MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX) + MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC) +-MISCFLAGS=$(MISCDEFS) $(MISCINC) ++MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS) + MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB) + + default: +@@ -915,7 +915,7 @@ + "CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm" + +@@ -927,7 +927,7 @@ + "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" + +@@ -936,10 +936,10 @@ + $(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 -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + +@@ -1035,10 +1035,10 @@ + $(MAKE) all \ + "ARCH = linux-thr" \ + "CC = gcc" \ +- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ + "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" + +@@ -1047,7 +1047,7 @@ + $(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" \ +@@ -1081,37 +1081,61 @@ + linux-lam: + $(MAKE) all \ + "ARCH = linux-lam" \ +- "CC = hcc" \ +- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ ++# Linux x86 using LAM MPI, with OpenGL display ++linux-lam-ogl: ++ $(MAKE) all \ ++ "ARCH = linux-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" + + # Linux AMD64/EM64T using LAM MPI +-linux-lam-64: ++linux-64-lam: + $(MAKE) all \ +- "ARCH = linux-lam-64" \ +- "CC = hcc" \ +- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ ++ "ARCH = linux-64-lam" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ + "RANLIB = ranlib" \ +- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm" ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" + + # Linux AMD64/EM64T using LAM MPI, with OpenGL display +-linux-lam-64-ogl: ++linux-64-lam-ogl: + $(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)" \ ++ "ARCH = linux-64-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ +- "STRIP = strip" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(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. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread" + + # Linux x86 using LAM MPI and threads + linux-lam-thr: +@@ -1149,6 +1173,54 @@ + "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 AMD64/EM64T using LAM MPI ++linux-ppc-lam: ++ $(MAKE) all \ ++ "ARCH = linux-ppc-lam" \ ++ "CC = mpicc" \ ++ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm" ++ ++# Linux AMD64/EM64T using LAM MPI, with OpenGL display ++linux-ppc-lam-ogl: ++ $(MAKE) all \ ++ "ARCH = linux-ppc-lam-ogl" \ ++ "CC = mpicc" \ ++ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \ ++ "AR = ar" \ ++ "ARFLAGS = r" \ ++ "STRIP = touch" \ ++ "RANLIB = ranlib" \ ++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm" ++ + # Linux PPC using gcc + linux-ps2: + $(MAKE) all \ +--- tachyon/unix/Make-config.r 2004-03-05 20:41:03.000000000 +0100 ++++ tachyon/unix/Make-config 2006-11-29 19:51:01.000000000 +0100 +@@ -57,7 +57,7 @@ + ########################################################################## + + # Standard MPICH installation location +-MPIDIR=/usr/local/mpi ++MPIDIR=/usr + + # UMR CS Dept + #MPIDIR=/software/all/mpi +@@ -108,14 +108,14 @@ + # http://www.ijg.org/files/ + ########################################################################## + # Uncomment the following lines to disable JPEG support +-USEJPEG= +-JPEGINC= +-JPEGLIB= ++#USEJPEG= ++#JPEGINC= ++#JPEGLIB= + + # Uncomment the following lines to enable JPEG support +-#USEJPEG= -DUSEJPEG +-#JPEGINC= -I/usr/local/include +-#JPEGLIB= -L/usr/local/lib -ljpeg ++USEJPEG= -DUSEJPEG ++JPEGINC= ++JPEGLIB= -ljpeg + + + ########################################################################## +@@ -128,14 +128,14 @@ + # http://www.libpng.org/ + ########################################################################## + # Uncomment the following lines to disable PNG support +-USEPNG= +-PNGINC= +-PNGLIB= ++#USEPNG= ++#PNGINC= ++#PNGLIB= + + # Uncomment the following lines to enable PNG support +-#USEPNG= -DUSEPNG +-#PNGINC= -I/usr/local/include +-#PNGLIB= -L/usr/local/lib -lpng -lz ++USEPNG= -DUSEPNG ++PNGINC= `pkg-config --cflags libpng` ++PNGLIB= `pkg-config --libs libpng` + + + ########################################################################## +--- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100 ++++ tachyon/unix/Make-opengl 2006-11-29 19:51:01.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 + + + # +@@ -37,8 +37,8 @@ + # + # Linux OpenGL / GLX include and link specs + # +-LINUX_GLX_INCS = -I/usr/X11R6/include +-LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11 ++LINUX_GLX_INCS = ++LINUX_GLX_LIBS = -lGL -lGLU -lX11 + + + # diff --git a/tachyon.spec b/tachyon.spec new file mode 100644 index 0000000..377032c --- /dev/null +++ b/tachyon.spec @@ -0,0 +1,148 @@ +%ifarch %{ix86} +%define target linux +%endif +%ifarch x86_64 +%define target linux-64 +%endif +%ifarch ppc +%define target linux-ppc +%endif + +Summary: Parallel / Multiprocessor Ray Tracing System +Name: tachyon +Version: 0.97 +Release: 2%{?dist} +URL: http://jedi.ks.uiuc.edu/~johns/raytracer/ +Group: Applications/Engineering +Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz +Patch0: %{name}-rpm.patch +License: BSD +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +BuildRequires: mesa-libGLU-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: lam-devel + +%description +A portable, high performance parallel ray tracing system supporting MPI +and multithreaded implementations. Tachyon is built as a C callable +library, which can be used with the included demo programs or within +your own application. The distribution also includes a simple scene +file parser front-end which reads a few different formats. + +This package contains pthread build. + +%package gl +Summary: Parallel / Multiprocessor Ray Tracing System +Group: Applications/Engineering +Provides: %{name} = %{version}-%{release} + +%description gl +A portable, high performance parallel ray tracing system supporting MPI +and multithreaded implementations. Tachyon is built as a C callable +library, which can be used with the included demo programs or within +your own application. The distribution also includes a simple scene +file parser front-end which reads a few different formats. + +This package contains pthread build with OpenGL display. + +%package lam +Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display +Group: Applications/Engineering +Provides: %{name} = %{version}-%{release} + +%description lam +A portable, high performance parallel ray tracing system supporting MPI +and multithreaded implementations. Tachyon is built as a C callable +library, which can be used with the included demo programs or within +your own application. The distribution also includes a simple scene +file parser front-end which reads a few different formats. + +This package contains LAM build. + +%package lam-gl +Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display +Group: Applications/Engineering +Provides: %{name} = %{version}-%{release} + +%description lam-gl +A portable, high performance parallel ray tracing system supporting MPI +and multithreaded implementations. Tachyon is built as a C callable +library, which can be used with the included demo programs or within +your own application. The distribution also includes a simple scene +file parser front-end which reads a few different formats. + +This package contains LAM build with OpenGL display. + +%package docs +Summary: Documentation and example scenes for tachyon +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description docs +This package contains documentation and example scenes for rendering +with tachyon. + +%prep +%setup -q -n %{name} +%patch0 -p1 -b .r +find . -name CVS | xargs %{__rm} -rf +chmod 644 src/hash.* +chmod 644 demosrc/trackball.c +chmod 644 scenes/imaps/* + +%build +pushd unix +%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr +%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl +%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam +%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl +popd + +%install +%{__rm} -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon} +for variant in -thr -thr-ogl -lam -lam-ogl ; do + install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant +done +rename -thr "" $RPM_BUILD_ROOT%{_bindir}/* +%{__rm} docs/tachyon/images.idx +%{__mv} docs/tachyon docs/html +%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes Copyright README +%attr(755,root,root) %{_bindir}/%{name} + +%files gl +%defattr(644,root,root,755) +%doc Changes Copyright README +%attr(755,root,root) %{_bindir}/%{name}-ogl + +%files lam +%defattr(644,root,root,755) +%doc Changes Copyright README +%attr(755,root,root) %{_bindir}/%{name}-lam + +%files lam-gl +%defattr(644,root,root,755) +%doc Changes 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 +%{_datadir}/tachyon + +%changelog +* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-2 +- use only kosher CFLAGS +- fix target setting + +* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> 0.97-1 +- initial build +- patch to add necessary build targets

1 0

Architecture specific change in rpms/gram_grep.git
by githook-noreply＠fedoraproject.org 01 Feb '25

01 Feb '25

The package rpms/gram_grep.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gram_grep.git/commit/?id=c1beb7074f…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit c1beb7074fa9bb34a9095237ed47389a952eb816 Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Sat Feb 1 08:47:42 2025 -0500 Do not build for i686 (leaf package) diff --git a/gram_grep.spec b/gram_grep.spec index 39eb3be..578b111 100644 --- a/gram_grep.spec +++ b/gram_grep.spec @@ -16,6 +16,9 @@ Source1: gram_grep.1 # *not* contribute to the binary RPMs. Source2: main-0.9.0.cpp +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: gcc-c++ BuildRequires: cmake # Ninja is a little faster than make and has no disadvantages. commit 9343bb01d7d52b6bdb859b1cfab4cc76853107cb Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Sat Feb 1 08:31:12 2025 -0500 Switch from plain makefiles to CMake diff --git a/gram_grep.spec b/gram_grep.spec index a2a4fc1..39eb3be 100644 --- a/gram_grep.spec +++ b/gram_grep.spec @@ -17,7 +17,9 @@ Source1: gram_grep.1 Source2: main-0.9.0.cpp BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: cmake +# Ninja is a little faster than make and has no disadvantages. +BuildRequires: ninja-build BuildRequires: dos2unix # https://docs.fedoraproject.org/en-US/packaging-guidelines/#_packaging_heade… @@ -39,19 +41,23 @@ find . -type f -exec file '{}' '+' | cut -d ':' -f 1 | xargs -r dos2unix --keepdate +# Remove include paths for unbundled header-only library dependencies +sed -r -i 's@^([[:blank:]]*)(include_directories.*"\.\./)@\1# \2@' \ + CMakeLists.txt + + +%conf +%cmake -GNinja + %build -# Upstream C++ flags are copied from Makefile (which does not support *adding* -# flags, only overriding them). Omitted -O, since the distribution flags should -# govern the optimization level. Omitted relative paths to header-only -# libraries that we have packaged system-wide. -export CXXFLAGS="${CXXFLAGS} -std=c++20 -Wall" -%make_build CXX="${CXX-g++}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" +%cmake_build %install -# Makefile has no install target. -install -t '%{buildroot}%{_bindir}' -p -D gram_grep +# The CMake build system has no provision for installing the program, so +# %%cmake_install would do nothing. We must install the executable manually. +install -t '%{buildroot}%{_bindir}' -p -D %{_vpath_builddir}/gram_grep install -t '%{buildroot}%{_mandir}/man1' -p -D -m 0644 '%{SOURCE1}' commit b8ae7b94ac754ff33f4ff05c98e53337781bf56c Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Sat Feb 1 07:46:44 2025 -0500 Add some messy but useful “smoke tests” based on documented examples diff --git a/gram_grep.spec b/gram_grep.spec index 084213a..a2a4fc1 100644 --- a/gram_grep.spec +++ b/gram_grep.spec @@ -11,6 +11,10 @@ URL: https://github.com/BenHanson/gram_grep Source0: %{url}/archive/%{version}/gram_grep-%{version}.tar.gz # Man page hand-written for Fedora in groff_man(7) format based on --help Source1: gram_grep.1 +# Main source file as of version 0.9.0; we use this for “smoke testing,” so we +# need a copy that does not change every time we ship an update. This does +# *not* contribute to the binary RPMs. +Source2: main-0.9.0.cpp BuildRequires: gcc-c++ BuildRequires: make @@ -51,7 +55,47 @@ install -t '%{buildroot}%{_bindir}' -p -D gram_grep install -t '%{buildroot}%{_mandir}/man1' -p -D -m 0644 '%{SOURCE1}' -# Upstream does not provide any tests. +%check +# Upstream does not provide any tests. We use a few of the examples from +# http://benhanson.net/gram_grep.html as “smoke tests.” + +# Make sure the program can at least print its help text and exit successfully +%{buildroot}%{_bindir}/gram_grep --help >/dev/null + +# Copy in a fixed version of main.cpp (as of version 0.9.0) as a sample file to +# process. By doing this instead of operating on the actual main.cpp, the +# output from our “smoke tests” does not change with each update. +cp -p '%{SOURCE2}' _x.cpp + +assert_same() { + # Parameters: actual, expected + set -o nounset + set -o errexit + if [ "${1}" != "${2}" ] + then + cat 1>&2 <<EOF +==== Actual ==== +${1} +==== Expected ==== +${2} +EOF + exit 1 + fi +} + +expected='_x.cpp:15:#include <lexertl/memory_file.hpp> +_x.cpp:616: lexertl::memory_file& mf, +_x.cpp:783: lexertl::memory_file mf(pathname.c_str()); +_x.cpp:1348: lexertl::memory_file& mf =' + +assert_same "$(set -o errexit + %{buildroot}%{_bindir}/gram_grep -Hn -v \ + --flex-regexp "\/\/.*|\/\*(?s:.)*?\*\/" -F memory_file _x.cpp +)" "${expected}" +# Same search with a config file: +assert_same "$(set -o errexit + %{buildroot}%{_bindir}/gram_grep -Hn --config=sample_configs/nosc.g _x.cpp +)" "${expected}" %files diff --git a/main-0.9.0.cpp b/main-0.9.0.cpp new file mode 100644 index 0000000..6c58530 --- /dev/null +++ b/main-0.9.0.cpp @@ -0,0 +1,1685 @@ +// A grep program that allows search by grammar or by lexer spec only +// as well as the conventional way. + +#include "pch.h" + +#include "args.hpp" +#include <lexertl/debug.hpp> +#include <lexertl/dot.hpp> +#include <filesystem> +#include <format> +#include <fstream> +#include <parsertl/generator.hpp> +#include "gg_error.hpp" +#include <parsertl/iterator.hpp> +#include <lexertl/memory_file.hpp> +#include "output.hpp" +#include "parser.hpp" +#include <queue> +#include "search.hpp" +#include <type_traits> +#include "version.hpp" + +extern std::string build_text(const std::string& input, + const capture_vector& captures); +extern const char* try_help(); +extern std::string unescape(const std::string_view& vw); +extern const char* usage(); + +enum class file_type +{ + ansi, binary, utf8, utf16, utf16_flip +}; + +using match_rev_iter = std::reverse_iterator<std::vector<match>::iterator>; +namespace fs = std::filesystem; + +std::regex g_capture_rx(R"(\$\d+)"); +condition_map g_conditions; +condition_parser g_condition_parser; +config_parser g_config_parser; +parser* g_curr_parser = nullptr; +uparser* g_curr_uparser = nullptr; +std::size_t g_files = 0; +std::size_t g_hits = 0; +bool g_modify = false; // Set when grammar has modifying operations +options g_options; +// maps path to pair. +// pair is wildcards and negated wildcards +std::map<std::string, wildcards> g_pathnames; +pipeline g_pipeline; +bool g_rule_print = false; +std::size_t g_searched = 0; + +file_type fetch_file_type(const char* data, std::size_t size) +{ + file_type type = file_type::ansi; + + if (size > 1) + { + auto utf16 = std::bit_cast<const uint16_t*>(data); + + switch (*utf16) + { + case 0xfeff: + type = file_type::utf16; + break; + case 0xfffe: + type = file_type::utf16_flip; + break; + default: + if (size > 2) + { + auto utf8 = std::bit_cast<const unsigned char*>(data); + + if (utf8[0] == 0xef && utf8[1] == 0xbb && utf8[2] == 0xbf) + type = file_type::utf8; + } + + break; + } + + if (type == file_type::ansi) + { + const char* second = data + size; + + if (std::find(data, second, '\0') != second) + type = file_type::binary; + } + } + + return type; +} + +file_type load_file(std::vector<unsigned char>& utf8, + const char*& data_first, const char*& data_second, + std::vector<match>& ranges) +{ + const std::size_t size = data_second - data_first; + file_type type = fetch_file_type(data_first, size); + + switch (type) + { + case file_type::utf16: + { + using in_iter = + lexertl::basic_utf16_in_iterator<const uint16_t*, int32_t>; + using out_iter = lexertl::basic_utf8_out_iterator<in_iter>; + auto first = std::bit_cast<const uint16_t*>(data_first + 2); + auto second = std::bit_cast<const uint16_t*>(data_second); + in_iter in(first, second); + in_iter in_end(second, second); + out_iter out(in, in_end); + out_iter out_end(in_end, in_end); + + utf8.reserve(size / 2 - 1); + + for (; out != out_end; ++out) + { + utf8.push_back(*out); + } + + data_first = std::bit_cast<const char*>(&utf8.front()); + data_second = data_first + utf8.size(); + ranges.emplace_back(data_first, data_first, data_second); + break; + } + case file_type::utf16_flip: + { + using in_flip_iter = lexertl::basic_utf16_in_iterator + <lexertl::basic_flip_iterator<const uint16_t*>, int32_t>; + using out_flip_iter = lexertl::basic_utf8_out_iterator<in_flip_iter>; + lexertl::basic_flip_iterator + first(std::bit_cast<const uint16_t*>(data_first + 2)); + lexertl::basic_flip_iterator + second(std::bit_cast<const uint16_t*>(data_second)); + in_flip_iter in(first, second); + in_flip_iter in_end(second, second); + out_flip_iter out(in, in_end); + out_flip_iter out_end(in_end, in_end); + + utf8.reserve(size / 2 - 1); + + for (; out != out_end; ++out) + { + utf8.push_back(*out); + } + + data_first = std::bit_cast<const char*>(&utf8.front()); + data_second = data_first + utf8.size(); + ranges.emplace_back(data_first, data_first, data_second); + break; + } + case file_type::utf8: + data_first += 3; + ranges.emplace_back(data_first, data_first, data_second); + break; + default: + ranges.emplace_back(data_first, data_first, data_second); + break; + } + + return type; +} + +[[nodiscard]] static bool perform_replacements(const match_rev_iter& iter, + const match& tuple, match_data& data) +{ + // Only allow _replace if g_modify (grammar actions) not set + if (g_options._perform_output && !g_modify) + { + const char* first = data._negate ? iter->_first : iter->_second; + + if (first < tuple._first || first > tuple._second) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}Cannot replace text when source is not " + "contained in original string.", + gg_text())); + return true; + } + else + { + // Replace with _replace. + const char* second = iter->_eoi; + + if (data._captures.empty()) + data._replacements[std::make_pair(first - data._first, + second - first)] = g_options._replace; + else + { + static lexertl::state_machine cap_sm; + std::string replace; + bool skip = false; + + if (cap_sm.empty()) + { + lexertl::rules rules; + + rules.push(R"(\$\d)", 1); + lexertl::generator::build(rules, cap_sm); + } + + lexertl::citerator i(g_options._replace.c_str(), + g_options._replace.c_str() + g_options._replace.size(), + cap_sm); + lexertl::citerator e; + + for (; i != e; ++i) + { + if (i->id == 1) + { + const std::size_t idx = atoi(i->first + 1); + + if (idx < data._captures.size()) + replace += data._captures[idx].front(); + else + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}Capture ${} is " + "out of range.", + gg_text(), + idx)); + skip = true; + } + } + else + replace.push_back(*i->first); + } + + if (!skip) + data._replacements[std::make_pair(first - data._first, + second - first)] = replace; + } + } + } + + return false; +} + +static std::string_view normalise_pathname(const std::string& pathname) +{ + std::string_view pn = (pathname[0] == '.' && + pathname[1] == fs::path::preferred_separator) ? + pathname.c_str() + 2 : + pathname.c_str(); + + return pn; +} + +static void print_pathname(const std::string& pathname) +{ + const std::string_view pn = normalise_pathname(pathname); + + output_text(std::cout, is_a_tty(stdout), + g_options._fn_text.c_str(), pn); +} + +static void print_prefix(const std::string& pathname, + match_data& data, const std::string& separator) +{ + if (pathname.empty()) + { + if (g_options._show_filename == show_filename::yes) + output_text(std::cout, is_a_tty(stdout), + g_options._fn_text.c_str(), g_options._label.c_str()); + } + else if (g_options._show_filename != show_filename::no) + { + print_pathname(pathname); + } + + if (((!g_options._label.empty() && + g_options._show_filename == show_filename::yes) || + (!pathname.empty() && + g_options._show_filename != show_filename::no)) && + g_options._line_numbers != line_numbers::with_parens) + { + output_text(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), separator.c_str()); + } + + if (g_options._line_numbers == line_numbers::with_parens) + output_text(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), "("); + + if (g_options._line_numbers != line_numbers::none) + { + output_text(std::cout, is_a_tty(stdout), + g_options._ln_text.c_str(), + std::to_string(1 + data._curr_line)); + output_text(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), + g_options._line_numbers == line_numbers::with_parens ? + (')' + separator).c_str() : + separator.c_str()); + } + + if (g_options._byte_offset) + { + output_text(std::cout, is_a_tty(stdout), + g_options._bn_text.c_str(), + std::to_string(data._curr - data._first)); + output_text(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), separator.c_str()); + } + + if (g_options._initial_tab) + std::cout << '\t'; +} + +static void find_bol(match_data& data) +{ + if (data._curr > data._eol) + { + data._bol = std::to_address(std:: + find(std::reverse_iterator(data._curr), + std::reverse_iterator(data._first), '\n')); + + if (data._bol != data._first) + ++data._bol; + + data._eol = std::find(data._curr, data._second, '\n'); + + if (data._eol != data._second) + { + if (*(data._eol - 1) == '\r') + --data._eol; + } + } +} + +template<class InputIterator, class NthOccurence, class UnaryPredicate> +InputIterator find_nth_if(InputIterator first, InputIterator last, + NthOccurence Nth, UnaryPredicate pred) +{ + if (Nth > 0) + { + for (; Nth && ++first != last; --Nth) + first = std::find_if(first, last, pred); + + return first; + } + else + return last; +} + +static std::size_t print_after(const std::string& pathname, match_data& data) +{ + std::size_t before = 0; + + if (data._curr_line) + { + std::size_t diff = data._curr_line - + (data._prev_line == std::string::npos ? + data._curr_line : + data._prev_line); + std::size_t until = 0; + + if (diff > g_options._after_context) + { + before = data._prev_line + 1; + until = before + g_options._after_context; + } + else + { + before = data._curr_line - (diff - 1); + until = data._curr_line; + } + + if (before < until) + { + const char* ptr = find_nth_if(data._first, data._second, before, + [](const char c) + { + return c == '\n'; + }); + const char* curr = data._curr; + std::size_t curr_line = data._curr_line; + + // Skip over \n + if (ptr != data._second) + ++ptr; + + for (; before < until; ++before) + { + const char* end = std::find(ptr, data._second, '\n'); + + if (end != data._second) + ++end; + + data._curr_line = before; + print_prefix(pathname, data, "-"); + std::cout << std::string_view(ptr, end); + ptr = end; + } + + data._curr = curr; + data._curr_line = curr_line; + data._prev_line = before; + } + + if (data._prev_line == std::string::npos) + diff = data._curr_line; + else + diff = data._curr_line - data._prev_line; + + if (diff > g_options._before_context) + before = data._curr_line - g_options._before_context; + else + before = data._curr_line - (diff - 1); + } + + return before; +} + +static void print_separators(const std::string& pathname, match_data& data) +{ + if (g_options._hit_separator) + { + // Number of lines since last hit + std::size_t before = print_after(pathname, data); + + if (data._curr_line - data._prev_line > 1) + { + const char* ptr = find_nth_if(data._first, data._second, before, + [](const char c) + { + return c == '\n'; + }); + const char* curr = data._curr; + std::size_t curr_line = data._curr_line; + + // Skip over \n + if (ptr != data._second) + ++ptr; + + if (!g_options._separator.empty() && + data._prev_line != std::string::npos && + data._curr_line - 1 - data._prev_line >= + g_options._before_context) + { + output_text_nl(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), g_options._separator.c_str()); + } + + for (; before < curr_line; ++before) + { + data._curr_line = before; + print_prefix(pathname, data, "-"); + + for (; ptr != data._second && + *ptr != '\r' && *ptr != '\n'; ++ptr) + { + std::cout << *ptr; + } + + std::cout << '\n'; + + if (ptr != data._second && *ptr == '\r') + ++ptr; + + if (ptr != data._second && *ptr == '\n') + ++ptr; + + ++data._curr_line; + } + + data._curr = curr; + data._curr_line = curr_line; + } + } +} + +static void display_match(const std::string& pathname, + match_data& data, const match_rev_iter& iter) +{ + if (data._curr > data._eol) + { + if (data._eol) + { + // Print remaining text until the end of line + for (; data._bol != data._eol; ++data._bol) + std::cout << *data._bol; + + std::cout << '\n'; + } + + data._prev_line = data._curr_line; + data._curr_line = std::count(data._first, data._curr, '\n'); + print_separators(pathname, data); + print_prefix(pathname, data, ":"); + } + + if (!g_options._only_matching && !g_options._whole_match && + !data._negate) + { + find_bol(data); + } + + if (g_options._whole_match) + { + output_text_nl(std::cout, is_a_tty(stdout), + g_options._ms_text.c_str(), iter->view()); + } + else if (g_options._only_matching) + { + const char* start = data._curr; + + for (; data._curr != iter->_eoi && + *data._curr != '\r' && *data._curr != '\n'; ++data._curr); + + output_text_nl(std::cout, is_a_tty(stdout), + g_options._ms_text.c_str(), + std::string_view(start, data._curr)); + } + else + { + if (g_options._colour && is_a_tty(stdout) && + !g_options._sl_text.empty()) + { + std::cout << g_options._sl_text; + + if (!g_options._ne) + std::cout << szEraseEOL; + } + + if (data._bol) + { + for (; data._bol < data._curr; ++data._bol) + std::cout << *data._bol; + } + else + std::cout << '\n'; + + if (!data._negate) + { + const char* eoi = data._eol > iter->_second ? + (iter->_first == iter->_second ? + (iter->_eoi < data._eol ? + iter->_eoi : + data._eol) : + iter->_second) : + data._eol; + + output_text(std::cout, is_a_tty(stdout), + g_options._ms_text.c_str(), + std::string_view(data._bol, eoi)); + data._bol = eoi; + } + } +} + +static bool process_matches(match_data& data, + std::map<std::pair<std::size_t, std::size_t>, + std::string>& temp_replacements, const std::string& pathname) +{ + bool finished = false; + const auto& tuple = data._ranges.front(); + auto iter = data._ranges.rbegin(); + auto end = data._ranges.rend(); + + data._replacements.insert(temp_replacements.begin(), temp_replacements.end()); + temp_replacements.clear(); + + if (perform_replacements(iter, tuple, data)) + return true; + + for (; iter != end; ++iter) + { + const char* first = iter->_second; + + if (first >= tuple._first && first <= tuple._eoi) + { + data._curr = iter->_first; + + if (g_options._pathname_only == pathname_only::yes) + { + print_pathname(pathname); + std::cout << output_nl; + finished = true; + } + else if (!g_options._print.empty()) + { + std::cout << build_text(g_options._print, data._captures); + } + else if (!g_options._exec.empty()) + { + const std::string cmd = build_text(g_options._exec, + data._captures); + + output_text_nl(std::cout, is_a_tty(stdout), + g_options._wa_text.c_str(), + std::format("Executing: {}", cmd)); + std::cout << exec_ret(cmd); + } + else if (g_options._pathname_only != pathname_only::negated && + !g_options._show_count && !g_rule_print && !g_options._quiet) + { + display_match(pathname, data, iter); + } + + ++data._hits; + break; + } + } + + if (data._hits == g_options._max_count) + finished = true; + + return finished; +} + +static void perform_output(match_data& data, const std::string& pathname, + lexertl::memory_file& mf, + const file_type type, const std::size_t size) +{ + const auto perms = fs::status(pathname.c_str()).permissions(); + + ++g_files; + g_hits += data._hits; + + if ((perms & fs::perms::owner_write) != fs::perms::owner_write) + { + // Read-only + if (!g_options._checkout.empty()) + { + std::string checkout = g_options._checkout; + + if (const std::size_t index = checkout.find("$1"); + index != std::string::npos) + { + checkout.erase(index, 2); + checkout.insert(index, pathname); + } + + if (::system(checkout.c_str()) != 0) + throw gg_error(std::format("Failed to execute {}.\n", + g_options._checkout)); + } + else if (g_options._force_write) + fs::permissions(pathname.c_str(), perms | fs::perms::owner_write); + } + + if (!data._replacements.empty()) + { + std::string content(data._first, data._second); + + for (auto iter = data._replacements.rbegin(), + end = data._replacements.rend(); iter != end; ++iter) + { + content.erase(iter->first.first, iter->first.second); + content.insert(iter->first.first, iter->second); + } + + data._replacements.clear(); + // In case the memory_file is still open + mf.close(); + + if ((fs::status(pathname.c_str()).permissions() & + fs::perms::owner_write) != fs::perms::owner_write) + { + if (!g_options._no_messages) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}{} is read only.", + gg_text(), + pathname)); + } + } + else + { + switch (type) + { + case file_type::utf16: + { + std::vector<uint16_t> utf16; + auto first = std::bit_cast<const unsigned char*>(&content.front()); + const unsigned char* second = first + content.size(); + lexertl::basic_utf8_in_iterator<const unsigned char*, int32_t> + iter(first, second); + lexertl::basic_utf8_in_iterator<const unsigned char*, int32_t> + end(second, second); + + utf16.reserve(size); + utf16.push_back(0xfeff); + + for (; iter != end; ++iter) + { + const int32_t val = *iter; + lexertl::basic_utf16_out_iterator<const int32_t*, uint16_t> + out_iter(&val, &val + 1); + lexertl::basic_utf16_out_iterator<const int32_t*, uint16_t> + out_end(&val + 1, &val + 1); + + for (; out_iter != out_end; ++out_iter) + { + utf16.push_back(*out_iter); + } + } + + std::ofstream os(pathname.c_str(), std::ofstream::binary); + + os.exceptions(std::ofstream::badbit); + os.write(std::bit_cast<const char*>(&utf16.front()), + utf16.size() * sizeof(uint16_t)); + os.close(); + break; + } + case file_type::utf16_flip: + { + std::vector<uint16_t> utf16; + auto first = std::bit_cast<const unsigned char*>(&content.front()); + const unsigned char* second = first + content.size(); + lexertl::basic_utf8_in_iterator<const unsigned char*, int32_t> + iter(first, second); + lexertl::basic_utf8_in_iterator<const unsigned char*, int32_t> + end(second, second); + + utf16.reserve(size); + utf16.push_back(0xfffe); + + for (; iter != end; ++iter) + { + const int32_t val = *iter; + lexertl::basic_utf16_out_iterator<const int32_t*, uint16_t> + out_iter(&val, &val + 1); + lexertl::basic_utf16_out_iterator<const int32_t*, uint16_t> + out_end(&val + 1, &val + 1); + + for (; out_iter != out_end; ++out_iter) + { + uint16_t flip = *out_iter; + lexertl::basic_flip_iterator flip_iter(&flip); + + utf16.push_back(*flip_iter); + } + } + + std::ofstream os(pathname.c_str(), std::ofstream::binary); + + os.exceptions(std::ofstream::badbit); + os.write(std::bit_cast<const char*>(&utf16.front()), + utf16.size() * sizeof(uint16_t)); + os.close(); + break; + } + case file_type::utf8: + { + std::ofstream os(pathname.c_str(), std::ofstream::binary); + const unsigned char header[] = { 0xef, 0xbb, 0xbf }; + + os.exceptions(std::ofstream::badbit); + os.write(std::bit_cast<const char*>(&header[0]), sizeof(header)); + os.write(content.c_str(), content.size()); + os.close(); + break; + } + default: + { + std::ofstream os(pathname.c_str(), std::ofstream::binary); + + os.exceptions(std::ofstream::badbit); + os.write(content.c_str(), content.size()); + os.close(); + break; + } + } + } + } +} + +static void process_file(const std::string& pathname, std::string* cin = nullptr) +{ + if (g_options._writable && (fs::status(pathname).permissions() & + fs::perms::owner_write) == fs::perms::none) + { + return; + } + + lexertl::memory_file mf(pathname.c_str()); + std::vector<unsigned char> utf8; + file_type type = file_type::ansi; + match_data data; + bool first_hit = true; + bool finished = false; + + if (!mf.data() && !cin) + { + if (!g_options._no_messages) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}failed to open {}.", + gg_text(), + pathname)); + } + + return; + } + + if (cin) + { + std::ostringstream ss; + + ss << std::cin.rdbuf(); + *cin = ss.str(); + data._first = cin->c_str(); + data._second = data._first + cin->size(); + } + else + { + data._first = mf.data(); + data._second = data._first + mf.size(); + } + + type = load_file(utf8, data._first, data._second, data._ranges); + + if (type == file_type::utf16 || type == file_type::utf16_flip) + // No need for original data + mf.close(); + else if (type == file_type::binary) + { + switch (g_options._binary_files) + { + case binary_files::text: + type = file_type::ansi; + break; + case binary_files::without_match: + return; + default: + break; + } + } + + do + { + std::map<std::pair<std::size_t, std::size_t>, std::string> + temp_replacements; + + if (bool success = search(data, temp_replacements); + success) + { + if (g_options._hit_separator && g_hits && first_hit && + g_options._pathname_only != pathname_only::negated && + !g_options._show_count && g_options._print.empty() && + !g_rule_print && !g_options._quiet) + { + output_text_nl(std::cout, is_a_tty(stdout), + g_options._se_text.c_str(), g_options._separator.c_str()); + } + + first_hit = false; + + if (type == file_type::binary) + { + std::cout << output_gg << "Binary file " << + normalise_pathname(pathname) << " matches\n"; + return; + } + else + { + finished = process_matches(data, temp_replacements, pathname); + } + } + + const match old = data._ranges.back(); + + data._ranges.pop_back(); + + if (!data._ranges.empty()) + { + // Cleardown any stale strings in matches. + // First makes sure current range is not from the same + // string (in matches) as the last. + if (const auto& curr = data._ranges.back(); + !data._matches.empty() && + (old._first < curr._first || old._first > curr._eoi)) + { + while (!data._matches.empty() && + old._first >= data._matches.top().c_str() && + old._eoi <= data._matches.top().c_str() + + data._matches.top().size()) + { + data._matches.pop(); + } + } + + // Start searching from end of last match + data._ranges.back()._first = data._ranges.back()._second; + } + } while (!finished && !data._ranges.empty()); + + if (g_options._pathname_only != pathname_only::negated && + !g_options._show_count && g_options._print.empty() && + !g_rule_print && !g_options._quiet) + { + for (; data._bol != data._eol; ++data._bol) + std::cout << *data._bol; + + if (data._bol) + // Only output newline if there has been at least one match + std::cout << '\n'; + + data._prev_line = data._curr_line; + data._curr_line = std::count(data._first, data._second, '\n'); + data._curr = data._second; + print_after(pathname, data); + } + + if (data._hits) + { + perform_output(data, pathname, mf, type, utf8.size()); + } + + if (g_options._show_count) + { + if (g_options._show_filename != show_filename::no) + { + print_pathname(pathname); + std::cout << ':'; + } + + std::cout << data._hits << output_nl; + } + + if (g_options._pathname_only == pathname_only::negated && !data._hits) + { + print_pathname(pathname); + std::cout << output_nl; + } + + ++g_searched; +} + +static bool process_file(const std::string& pathname, const wildcards &wcs) +{ + bool process = false; + const char* filename = pathname.c_str() + + pathname.rfind(fs::path::preferred_separator) + 1; + bool skip = !g_options._exclude._negative.empty(); + + for (const auto& pn : g_options._exclude._negative) + { + if (!pn._wc.match(filename)) + { + skip = false; + break; + } + } + + if (!skip) + { + for (const auto& pn : g_options._exclude._positive) + { + if (pn._wc.match(filename)) + { + skip = true; + break; + } + } + } + + if (!skip) + { + process = !wcs._negative.empty(); + + for (const auto& pn : wcs._negative) + { + if (!pn._wc.match(pathname)) + { + process = false; + break; + } + } + + if (!process) + { + for (const auto& pn : wcs._positive) + { + if (pn._wc.match(pathname)) + { + process = true; + break; + } + } + } + } + + return process; +} + +bool include_file(const std::string& path) +{ + return (g_options._include._positive.empty() || + std::ranges::any_of(g_options._include._positive, + [&path](const auto& pn) + { + return pn._wc.match(path); + })) && + std::ranges::none_of(g_options._include._negative, + [&path](const auto& pn) + { + return pn._wc.match(path); + }); +} + +bool include_dir(const std::string& path) +{ + return (g_options._exclude_dirs._negative.empty() || + std::ranges::any_of(g_options._exclude_dirs._negative, + [&path](const auto& pn) + { + return pn._wc.match(path); + })) && + std::ranges::none_of(g_options._exclude_dirs._positive, + [&path](const auto& pn) + { + return pn._wc.match(path); + }); +} + +static void process() +{ + std::queue<std::pair<std::string, const wildcards*>> queue; + + for (const auto& [path, wcs] : g_pathnames) + { + queue.emplace(path, &wcs); + } + + for (; !queue.empty(); queue.pop()) + { + const auto& [path, wcs] = queue.front(); + std::error_code err; + bool processed = false; + + for (auto iter = fs::directory_iterator(path, + fs::directory_options::skip_permission_denied, err), + end = fs::directory_iterator(); iter != end; ++iter) + { + const auto& p = iter->path(); + + // Don't throw if there is a Unicode pathname + const std::string pathname = reinterpret_cast<const char*> + (p.u8string().c_str()); + + if (!fs::is_directory(p) || + g_options._directories == directories::read) + { + if (!process_file(pathname, *wcs)) + continue; + } + + if (fs::is_directory(p)) + { + switch (g_options._directories) + { + case directories::read: + if (!g_options._no_messages) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}{}: Is a directory", + gg_text(), + normalise_pathname(p.string()))); + } + + break; + case directories::recurse: + if (!(fs::is_symlink(p) && !g_options._follow_symlinks) && + include_dir(pathname.substr(pathname. + rfind(fs::path::preferred_separator) + 1))) + { + queue.emplace(pathname, wcs); + } + + break; + case directories::skip: + // Do nothing + break; + } + } + else + { + if ((g_options._writable && (fs::status(p).permissions() & + fs::perms::owner_write) == fs::perms::none) || + // Skip zero length files + fs::file_size(p) == 0) + { + continue; + } + + if (include_file(pathname.substr(pathname. + rfind(fs::path::preferred_separator) + 1))) + { + process_file(pathname); + processed = true; + } + } + } + + if (!processed && g_options._directories != directories::recurse && + !g_options._no_messages) + { + for (const auto& wildcard : wcs->_positive) + { + if (!wildcard._pathname.empty()) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}{}: No such file or directory", + gg_text(), + normalise_pathname(wildcard._pathname))); + } + } + } + } +} + +void add_pathname(std::string pn, + std::map<std::string, wildcards>& map) +{ + const std::size_t wc_idx = pn.find_first_of("*?["); + const std::size_t sep_idx = pn.rfind(fs::path::preferred_separator, + wc_idx); + const bool negate = pn[0] == '!'; + const std::string path = sep_idx == std::string::npos ? "." : + pn.substr(negate ? 1 : 0, sep_idx + (negate ? 0 : 1)); + auto& wcs = map[path]; + + if (g_options._show_filename == show_filename::undefined && + !g_options._quiet && !pn.empty() && + (g_options._directories == directories::recurse || + wc_idx != std::string::npos || negate)) + { + g_options._show_filename = show_filename::yes; + } + + if (sep_idx == std::string::npos) + { + if (!((!negate && wc_idx == 0) || (negate && wc_idx == 1))) + { + if (g_options._directories == directories::recurse) + pn.insert(negate ? 1 : 0, std::string(1, '*') + + static_cast<char>(fs::path::preferred_separator)); + else + pn.insert(negate ? 1 : 0, path + + static_cast<char>(fs::path::preferred_separator)); + } + } + else if (g_options._directories == directories::recurse && + !((!negate && wc_idx == 0) || (negate && wc_idx == 1))) + { + pn = std::string(1, '*') + pn.substr(sep_idx); + + if (negate) + pn = '!' + pn; + } + + if (negate) + wcs._negative.emplace_back(wildcardtl::wildcard{ pn, is_windows() }, + wc_idx == std::string::npos ? + pn : + std::string()); + else + wcs._positive.emplace_back(wildcardtl::wildcard{ pn, is_windows() }, + wc_idx == std::string::npos ? + pn : + std::string()); +} + +lexertl::state_machine word_lexer() +{ + static lexertl::state_machine sm; + + if (sm.empty()) + { + lexertl::rules rules; + + rules.push(R"([A-Z_a-z]\w*)", 1); + rules.push("(?s:.)", lexertl::rules::skip()); + lexertl::generator::build(rules, sm); + } + + return sm; +} + +static void fill_pipeline(std::vector<config>&& configs) +{ + std::size_t word_list_idx = 0; + + // Postponed to allow -i to be processed first. + for (auto&& config : std::move(configs)) + { + switch (config._type) + { + case match_type::dfa_regex: + { + if (g_options._force_unicode) + { + // Use the lexertl enum operator + using namespace lexertl; + using rules_type = basic_rules<char, char32_t>; + using ugenerator = basic_generator<rules_type, + u32state_machine>; + rules_type rules; + ulexer lexer; + + lexer._flags = config._flags; + lexer._conditions = std::move(config._conditions); + + if (lexer._flags & *config_flags::icase) + rules.flags(*regex_flags::icase | + *regex_flags::dot_not_cr_lf); + + rules.push(config._param, 1); + + if (g_options._dump == dump::no) + rules.push("(?s:.)", rules_type::skip()); + + ugenerator::build(rules, lexer._sm); + g_pipeline.emplace_back(std::move(lexer)); + } + else + { + // Use the lexertl enum operator + using namespace lexertl; + rules rules; + lexer lexer; + + lexer._flags = config._flags; + lexer._conditions = std::move(config._conditions); + + if (lexer._flags & *config_flags::icase) + rules.flags(*regex_flags::icase | + *regex_flags::dot_not_cr_lf); + + rules.push(config._param, 1); + + if (g_options._dump == dump::no) + rules.push("(?s:.)", rules::skip()); + + generator::build(rules, lexer._sm); + g_pipeline.emplace_back(std::move(lexer)); + } + + break; + } + case match_type::parser: + { + if (g_options._force_unicode) + { + uparser parser; + config_state state; + + parser._flags = config._flags; + parser._conditions = std::move(config._conditions); + g_curr_uparser = &parser; + + if (g_config_parser._gsm.empty()) + build_config_parser(); + + state.parse(config._flags, config._param); + g_rule_print |= state._print; + + if (parser._gsm.empty()) + { + ulexer lexer; + + lexer._flags = parser._flags; + lexer._conditions = std::move(parser._conditions); + lexer._sm.swap(parser._lsm); + g_pipeline.emplace_back(std::move(lexer)); + } + else + g_pipeline.emplace_back(std::move(parser)); + } + else + { + parser parser; + config_state state; + + parser._flags = config._flags; + parser._conditions = std::move(config._conditions); + g_curr_parser = &parser; + + if (g_config_parser._gsm.empty()) + build_config_parser(); + + state.parse(config._flags, config._param); + g_rule_print |= state._print; + + if (parser._gsm.empty()) + { + lexer lexer; + + lexer._flags = parser._flags; + lexer._conditions = std::move(parser._conditions); + lexer._sm.swap(parser._lsm); + g_pipeline.emplace_back(std::move(lexer)); + } + else + g_pipeline.emplace_back(std::move(parser)); + } + + break; + } + case match_type::regex: + { + // Use the lexertl enum operator + using namespace lexertl; + regex regex; + std::regex::flag_type rx_flags{}; + + regex._flags = config._flags; + regex._conditions = std::move(config._conditions); + + if (regex._flags & *config_flags::icase) + rx_flags |= std::regex_constants::icase; + + if (regex._flags & *config_flags::grep) + rx_flags |= std::regex_constants::grep; + else if (regex._flags & *config_flags::egrep) + rx_flags |= std::regex_constants::egrep; + else + rx_flags |= std::regex_constants::ECMAScript; + + regex._rx.assign(config._param, rx_flags); + g_pipeline.emplace_back(std::move(regex)); + break; + } + case match_type::text: + { + text text; + + text._flags = config._flags; + text._conditions = std::move(config._conditions); + text._text = config._param; + g_pipeline.emplace_back(std::move(text)); + break; + } + case match_type::word_list: + { + word_list words; + lexertl::memory_file& mf = + g_options._word_list_files[word_list_idx]; + const lexertl::state_machine sm = word_lexer(); + lexertl::citerator iter; + + words._flags = config._flags; + words._conditions = std::move(config._conditions); + mf.open(config._param.c_str()); + + if (mf.data() == nullptr) + throw gg_error(std::format("Cannot open {}", config._param)); + + iter = lexertl::citerator(mf.data(), mf.data() + mf.size(), sm); + + for (; iter->id != 0; ++iter) + { + words._list.push_back(iter->view()); + } + + std::ranges::sort(words._list); + g_pipeline.emplace_back(std::move(words)); + break; + } + default: + break; + } + } +} + +void parse_colours(const std::string& colours) +{ + parsertl::rules grules; + parsertl::state_machine gsm; + lexertl::rules lrules; + lexertl::state_machine lsm; + + grules.token("VALUE"); + grules.push("start", "list"); + grules.push("list", "item | list ':' item"); + + const uint16_t name_val_idx = grules.push("item", "name '=' value"); + // rv flag + const uint16_t rv_idx = grules.push("item", "'rv'"); + // ne flag + const uint16_t ne_idx = grules.push("item", "'ne'"); + + grules.push("name", + "'sl' | 'cx' | 'mt' | 'ms' | 'mc' | 'fn' | 'ln' | 'bn' | 'se' | 'wa'"); + grules.push("value", "%empty | VALUE"); + parsertl::generator::build(grules, gsm); + + lrules.push(":", grules.token_id("':'")); + lrules.push("=", grules.token_id("'='")); + lrules.push("sl", grules.token_id("'sl'")); + lrules.push("cx", grules.token_id("'cx'")); + lrules.push("rv", grules.token_id("'rv'")); + lrules.push("mt", grules.token_id("'mt'")); + lrules.push("ms", grules.token_id("'ms'")); + lrules.push("mc", grules.token_id("'mc'")); + lrules.push("fn", grules.token_id("'fn'")); + lrules.push("ln", grules.token_id("'ln'")); + lrules.push("bn", grules.token_id("'bn'")); + lrules.push("se", grules.token_id("'se'")); + lrules.push("ne", grules.token_id("'ne'")); + lrules.push("wa", grules.token_id("'wa'")); + lrules.push(R"(\d{1,3}(;\d{1,3}){0,2})", grules.token_id("VALUE")); + lexertl::generator::build(lrules, lsm); + + lexertl::citerator liter(colours.c_str(), + colours.c_str() + colours.size(), lsm); + parsertl::citerator giter(liter, gsm); + + for (; giter->entry.action != parsertl::action::accept && + giter->entry.action != parsertl::action::error; ++giter) + { + if (giter->entry.param == name_val_idx) + { + const auto value = giter.dollar(2).view(); + + if (value.empty()) + // Ignore blank value + continue; + + static std::pair<const char*, std::string&> lookup[] = + { + {"sl", g_options._sl_text}, + {"cx", g_options._cx_text}, + {"ms", g_options._ms_text}, + {"mc", g_options._mc_text}, + {"fn", g_options._fn_text}, + {"ln", g_options._ln_text}, + {"bn", g_options._bn_text}, + {"se", g_options._se_text}, + {"wa", g_options._wa_text} + }; + const auto name = giter.dollar(0).view(); + + if (name == "mt") + { + g_options._ms_text = std::format("\x1b[{}m", value); + g_options._mc_text = std::format("\x1b[{}m", value); + } + else + { + auto iter = std::ranges::find_if(lookup, [name](const auto& pair) + { + return name == pair.first; + }); + + if (iter != std::end(lookup)) + iter->second = std::format("\x1b[{}m", value); + } + } + else if (giter->entry.param == rv_idx) + g_options._rv = true; + else if (giter->entry.param == ne_idx) + { + g_options._ne = true; + } + } +} + +std::vector<const char*> to_vector(std::string& grep_options) +{ + std::vector<const char*> ret; + char* prev = &grep_options[0]; + char* options = prev; + + // Append dummy entry + ret.push_back(prev + grep_options.size()); + + for (; *options; ++options) + { + if (strchr(" \t", *options)) + { + *options = '\0'; + ++options; + + ret.push_back(prev); + + if (!*options) + break; + + prev = options; + } + } + + if (*prev) + ret.push_back(prev); + + return ret; +} + +std::string env_var(const char* var) +{ + std::string ret; +#ifdef _WIN32 + const DWORD dwSize = ::GetEnvironmentVariableA(var, nullptr, 0); + + if (dwSize) + { + ret.resize(dwSize - 1, ' '); + ::GetEnvironmentVariableA(var, &ret.front(), dwSize); + } +#else + const char* str = std::getenv(var); + + if (str) + ret = str; +#endif + + return ret; +} + +void show_usage(const std::string& msg = std::string()) +{ + std::cerr << msg << usage() << try_help(); + exit(2); +} + +int main(int argc, char* argv[]) +{ + try + { + if (argc == 1) + { + show_usage(); + } + + std::vector<config> configs; + std::vector<std::string> files; + bool run = true; + std::string grep_options = env_var("GREP_OPTIONS"); + auto options = to_vector(grep_options); + + read_switches(static_cast<int>(options.size()), + &options.front(), configs, files); + parse_colours(env_var("GREP_COLORS")); + read_switches(argc, argv, configs, files); + fill_pipeline(std::move(configs)); + + // Postponed to allow -r to be processed first as + // add_pathname() checks g_recursive. + for (const auto& f : files) + { + auto pathnames = split(f.c_str(), ';'); + + for (const auto& p : pathnames) + { + const char* param = p.data(); + + add_pathname(std::string(param, param + p.size()), g_pathnames); + } + } + + if (g_options._show_filename == show_filename::undefined && + g_pathnames.size() == 1) + { + auto iter = g_pathnames.begin(); + + if (iter->second._negative.size() + + iter->second._positive.size() == 1) + { + g_options._show_filename = show_filename::no; + } + } + + if (g_options._dump_argv) + { + std::cout << "argv[] =\n"; + + for (int idx = 0; idx != argc; ++idx) + { + std::cout << " " << argv[idx] << output_nl; + } + + return 0; + } + + if (g_options._dump != dump::no) + { + for (const auto& v : g_pipeline) + { + if (static_cast<match_type>(v.index()) == match_type::lexer && + !g_options._force_unicode) + { + const auto& l = std::get<lexer>(v); + + if (g_options._dump == dump::dot) + lexertl::dot::dump(l._sm, lexertl::rules(), std::cout); + else + lexertl::debug::dump(l._sm, std::cout); + } + } + + return 0; + } + + if (g_options._show_version) + { + std::cout << "gram_grep " << g_version_string; + std::cout << output_nl; + return 0; + } + + if (g_pipeline.empty()) + { + show_usage(); + } + + if (g_options._pathname_only != pathname_only::no && + g_options._show_count) + { + throw gg_error("Cannot combine -l and --count."); + } + + if (g_options._perform_output && g_pathnames.empty()) + throw gg_error("Cannot combine stdin with -o."); + + if (!g_options._replace.empty() && g_modify) + throw gg_error("Cannot combine --replace with grammar " + "actions that modify the input."); + + if (!g_options._startup.empty()) + { + if (::system(g_options._startup.c_str())) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}Failed to execute {}.", + gg_text(), + g_options._startup)); + run = false; + } + } + + if (run) + { + if (g_pathnames.empty()) + { + std::string cin; + + process_file(std::string(), &cin); + } + else + process(); + } + + if (!g_options._shutdown.empty()) + if (::system(g_options._shutdown.c_str())) + { + output_text_nl(std::cerr, is_a_tty(stderr), run ? + g_options._ms_text.c_str() : + g_options._wa_text.c_str(), + std::format("{}Failed to execute {}.", + gg_text(), + g_options._shutdown)); + } + + if (g_options._summary) + { + std::cout << "Matches: " << g_hits << " Matching files: " << + g_files << " Total files searched: " << g_searched << + output_nl; + } + + return g_hits ? 0 : 1; + } + catch (const std::exception& e) + { + output_text_nl(std::cerr, is_a_tty(stderr), + g_options._wa_text.c_str(), + std::format("{}{}", + gg_text(), + e.what())); + return 1; + } +} commit 50b8b59551c5bdda8b9d42b4e5a73a7305d713a2 Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Sat Feb 1 07:04:10 2025 -0500 Initial package (close RHBZ#2264773) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..04a9707 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/gram_grep-0.9.0.tar.gz diff --git a/gram_grep.1 b/gram_grep.1 new file mode 100644 index 0000000..5572e42 --- /dev/null +++ b/gram_grep.1 @@ -0,0 +1,410 @@ +.TH GRAM_GREP "1" "January 2025" "" "User Commands" +.SH NAME +.B gram_grep +\(en Search for \fIPATTERN\fRs in each \fIFILE\fR or standard input +.SH SYNOPSIS +.B gram_grep +.RI ([ OPTION ]...\: +.IR PATTERN )+ +.RI [ FILE ]...\: +.SH DESCRIPTION +Search for +.IR PATTERN s +in each +.I FILE +or standard input. +.I PATTERN +is, by default, a basic regular expression (BRE). +This is only true for the first +.I PATTERN +(for +.BR grep (1) +compatibility). +.SH OPTIONS +.SS "PATTERN SELECTION AND INTERPRETATION" +.TP +.B \-E\fR, \fB\-\-extended\-regexp +.IR PATTERN s +are extended regular expressions +.TP +.B \-F\fR, \fB\-\-fixed\-strings +.I PATTERN +is a string +.TP +.B \-G\fR, \fB\-\-basic\-regexp +.IR PATTERN s +are basic regular expressions +.TP +.B \-P\fR, \fB\-\-perl\-regexp +.I PATTERN +is a Perl regular expression +.TP +.B \-e\fR, \fB\-\-regexp=\fIPATTERNS +use +.IR PATTERN s +for matching +.TP +.B \-f\fR, \fB\-\-file=\fIFILE +take +.IR PATTERN s +from +.I FILE +.TP +.B \-i\fR, \fB\-\-ignore\-case +ignore case distinctions in patterns and data +.TP +.B \-\-no\-ignore\-case +do not ignore case distinctions +.RI ( default ) +.TP +.B \-w\fR, \fB\-\-word\-regexp +match only whole words +.TP +.B \-x\fR, \fB\-\-line\-regexp +match only whole lines +.SS MISCELLANEOUS +.TP +.B \-s\fR, \fB\-\-no\-messages +suppress error messages +.TP +.B \-v\fR, \fB\-\-invert\-match +select non-matching text +.TP +.B \-V\fR, \fB\-\-version +display version information and exit +.TP +.B \-\-help +display help text and exit +.SS "OUTPUT CONTROL" +.TP +.B \-m\fR, \fB\-\-max\-count=\fINUM +stop after +.I NUM +selected lines +.TP +.B \-b\fR, \fB\-\-byte\-offset +print the byte offset with output lines +.TP +.B \-n\fR, \fB\-\-line\-number +print line number with output lines +.TP +.B \-\-line\-buffered +flush output on every line +.TP +.B \-H\fR, \fB\-\-with\-filename +print file name with output lines +.TP +.B \-h\fR, \fB\-\-no\-filename +suppress the file name prefix on output +.TP +.B \-\-label=\fILABEL +use +.I LABEL +as the standard input file name prefix +.TP +.B \-o\fR, \fB\-\-only\-matching +show only nonempty parts of lines that match +.TP +.B \-q\fR, \fB\-\-quiet\fR, \fB\-\-silent +suppress all normal output +.TP +.B \-\-binary\-files=\fITYPE +assume that binary files are +.IR TYPE ; +.I TYPE +is +.BR binary , +.BR text , +or +.B without\-match +.TP +.B \-a\fR, \fB\-\-text +equivalent to +.B \-\-binary\-files=text +.TP +.B \-I +equivalent to +.B \-\-binary\-files=without\-match +.TP +.B \-d\fR, \fB\-\-directories=\fIACTION +how to handle directories; +.I ACTION +is +.BR read , +.BR recurse , +or +.B skip +.TP +.B \-r\fR, \fB\-\-recursive +like +.B \-\-directories=recurse +.TP +.B \-R\fR, \fB\-\-dereference\-recursive +likewise, but follow all symlinks +.TP +.B \-\-include=\fIGLOB +search only files that match +.I GLOB +(a file pattern) +.TP +.B \-\-exclude=\fIGLOB +skip files that match +.I GLOB +.TP +.B \-\-exclude\-from=\fIFILE +skip files that match any file pattern from +.I FILE +.TP +.B \-\-exclude-dir=\fIGLOB +skip directories that match +.I GLOB +.TP +.B \-L\fR, \fB\-\-files\-without\-match +print only names of +.IR FILE s +with no selected lines +.TP +.B \-l\fR, \fB\-\-files\-with\-matches +print only names of +.IR FILE s +with selected lines +.TP +.B \-c\fR, \fB\-\-count +print only a count of selected lines per +.I FILE +.TP +.B \-T\fR, \fB\-\-initial\-tab +make tabs line up (if needed) +.TP +.B \-Z\fR, \fB\-\-null +print 0 byte after +.I FILE +name +.SS "CONTEXT CONTROL" +.TP +.B \-B\fR, \fB\-\-before\-context=\fINUM +print +.I NUM +lines of leading context +.TP +.B \-A\fR, \fB\-\-after\-context=\fINUM +print +.I NUM +lines of trailing context +.TP +.B \-C\fR, \fB\-\-context=\fINUM +print +.I NUM +lines of output context +.TP +.B \-\fINUM +same as +.B \-\-context=\fINUM +.TP +.B \-\-group\-separator=\fISEP +print +.I SEP +on line between matches with context +.TP +.B \-\-no\-group\-separator +do not print separator for matches with context +.TP +.B \-\-color\fR[\fB=\fIWHEN\fR], \fB\-\-colour\fR[\fB=\fIWHEN\fR] +use markers to highlight the matching strings; +.I WHEN +is +.BR always , +.BR never , +or +.B auto +.SS "GRAM_GREP SPECIFIC SWITCHES" +.TP +.B \-\-checkout=\fICMD +checkout command (include +.B $1 +for pathname) +.TP +.B \-\-config=\fICONFIG_FILE +search using config file +.TP +.B \-\-display\-whole\-match +display a multiline match +.TP +.B \-\-dump +dump DFA regexp +.TP +.B \-\-dump-argv +dump command line arguments +.TP +.B \-\-dump-dot +dump DFA regexp in DOT format +.TP +.B \-\-exec=\fICMD +Executes the supplied command +.TP +.B \-\-extend\-search +extend the end of the next match to be the current match +.TP +.B \-\-flex\-regexp +.I PATTERN +is a flex style regexp +.TP +.B \-\-force-write +if a file is read only, force it to be writable +.TP +.B \-\-if=\fICONDITION +make search conditional +.TP +.B \-\-invert\-match\-all +only match if the search does not match at all +.TP +.B \-N\fR, \fB\-\-line\-number\-parens +print line number in parenthesis with output lines +.TP +.B \-\-perform\-output +output changes to matching file +.TP +.B \-p\fR, \fB\-\-print=\fITEXT +print +.I TEXT +instead of line of match +.TP +.B \-\-replace=\fITEXT +replace match with +.I TEXT +.TP +.B \-\-return-previous-match +return the previous match instead of the current one +.TP +.B \-\-shutdown=\fICMD +command to run when exiting +.TP +.B \-\-startup=\fICMD +command to run at startup +.TP +.B \-\-summary +show match count footer +.TP +.B \-\-utf8 +in the absence of a BOM assume UTF-8 +.TP +.B \-W\fR, \fB\-\-word\-list=\fIPATHNAME +search for a word from the supplied word list +.TP +.B \-\-writable +only process files that are writable +.SH FILES +A configuration file can be supplied using +.B \-\-config=\fICONFIG_FILE\fR. +.SS "CONFIG FILE FORMAT" +.P +.RS +3n +.EX +.BI < grammar\ directives > +.B %% +.BI < grammar > +.B %% +.BI < regexp\ macros > +.B %% +.BI < regexes > +.B %% +.EE +.RE +.SS "GRAMMAR DIRECTIVES" +.TP +.B %captures +(parenthesis in grammars will be treated as captures) +.TP +.B %consume +(list tokens that are not to be reported as unused) +.TP +.B %option caseless +.TP +.B %token +.TP +.B %left +.TP +.B %right +.TP +.B %nonassoc +.TP +.B %precedence +.TP +.B %start +.TP +.B %x +.SS "GRAMMAR SCRIPTING" +.IP \(bu +2n +Note that all strings can contain +.BI $ n +indexes +.SS "FUNCTIONS RETURNING STRINGS" +.TP +.B format('\fItext\fB', ...); +(use +.B {} +for format specifiers) +.TP +.B replace_all('\fItext\fB', '\fIregexp\fB', '\fItext\fB'); +.TP +.B system('\fItext\fB'); +.SS "GENERAL FUNCTIONS" +.TP +.B erase($\fIn\fB); +.TP +.B erase($\fIfrom\fB, $\fIto\fB); +.TP +.B erase($\fIfrom\fB.second, $\fIto\fB.first); +.TP +.B insert($\fIn\fB, '\fItext\fB'); +.TP +.B insert($\fIn\fB.second, '\fItext\fB'); +.TP +.B match = $\fIn\fB; +.TP +.B match += $\fIn\fB; +.TP +.B match = substr($\fIn\fB, \fR<\fIomit\ from\ left\fR>\fB, \fR<\fIomit\ from\ right\fR>\fB); +.TP +.B match += substr($\fIn\fB, \fR<\fIomit\ from\ left\fR>\fB, \fR<\fIomit\ from\ right\fR>\fB); +.TP +.B print('\fItext\fB'); +.TP +.B replace($\fIn\fB, '\fItext\fB'); +.TP +.B replace($\fIfrom\fB, $\fIto, '\fItext\fB'); +.TP +.B replace($\fIfrom\fB.second, $\fIto\fB.first, '\fItext\fB'); +.TP +.B replace_all($\fIn\fB, '\fIregexp\fB', '\fItext\fB'); +.SS "\-\-if SYNTAX" +.TP +.B regex_search($\fIn\fB, '\fIregex\fB'){ ||\ regex_search($\fIn\fB, '\fIregex\fB')} +.SS EXAMPLE +.RS +3n +.EX +.B %token\ RawString\ String +.B %% +.B list:\ String {\ match\ =\ substr($1,\ 1,\ 1);\ }; +.B list:\ RawString\ {\ match\ =\ substr($1,\ 3,\ 2);\ }; +.B list:\ list\ String\ { match\ +=\ substr($2\, 1,\ 1);\ }; +.B list:\ list\ RawString\ { match\ +=\ substr($2,\ 3,\ 2);\ }; +.B %% +.B ws\ [\ \\\\t\\\\r\\\\n]+ +.B %% +.B \\\\"([^"\\\\\\\\\\\\r\\\\n]|\\\\\\\\.)*\\\\"\ \ \ \ \ \ \ \ String +.B R\\\\"\\\$(?s:.)*?\\\$\\\\"\ \ \ \ \ \ \ \ \ \ \ \ RawString +.B '([^'\\\\\\\\\\\\r\\\\n]|\\\\\\\\.)*'\ \ \ \ \ \ \ \ \ \ skip() +.B {ws}|"//".*|"/*"(?s:.)*?"*/"\ skip() +.B %% +.EE +.RE +.SH NOTES +Note that you can pipeline searches by using multiple switches. +The searches are run in the order they occur on the command line. +.SH EXAMPLES +.EX +.B gram_grep\ \-i\ "hello\ world"\ menu.h\ main.c +.EE +.SH "SEE ALSO" +.BR grep (1) diff --git a/gram_grep.spec b/gram_grep.spec new file mode 100644 index 0000000..084213a --- /dev/null +++ b/gram_grep.spec @@ -0,0 +1,67 @@ +Name: gram_grep +Summary: Search text using a grammar, lexer, or straight regex +Version: 0.9.0 +Release: %autorelease + +# Since dependencies lexertl17, parsertl17, and wildcardtl are header-only, we +# must treat them as static libraries, and their licenses contribute to the +# license of the binary RPM. All three are BSL-1.0. +License: BSL-1.0 +URL: https://github.com/BenHanson/gram_grep +Source0: %{url}/archive/%{version}/gram_grep-%{version}.tar.gz +# Man page hand-written for Fedora in groff_man(7) format based on --help +Source1: gram_grep.1 + +BuildRequires: gcc-c++ +BuildRequires: make +BuildRequires: dos2unix + +# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_packaging_heade… +BuildRequires: lexertl17-static +BuildRequires: parsertl17-static +BuildRequires: wildcardtl-static + +%description +Search text using a grammar, lexer, or straight regex. Chain searches for +greater refinement. + + +%prep +%autosetup -n gram_grep-%{version} + +# Fix line terminations (particularly for files that may be installed) +find . -type f -exec file '{}' '+' | + grep -E '\bCRLF\b' | + cut -d ':' -f 1 | + xargs -r dos2unix --keepdate + + +%build +# Upstream C++ flags are copied from Makefile (which does not support *adding* +# flags, only overriding them). Omitted -O, since the distribution flags should +# govern the optimization level. Omitted relative paths to header-only +# libraries that we have packaged system-wide. +export CXXFLAGS="${CXXFLAGS} -std=c++20 -Wall" +%make_build CXX="${CXX-g++}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" + + +%install +# Makefile has no install target. +install -t '%{buildroot}%{_bindir}' -p -D gram_grep +install -t '%{buildroot}%{_mandir}/man1' -p -D -m 0644 '%{SOURCE1}' + + +# Upstream does not provide any tests. + + +%files +%license LICENCE.txt +%doc README.md +%doc sample_configs/ + +%{_bindir}/gram_grep +%{_mandir}/man1/gram_grep.1* + + +%changelog +%autochangelog diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..a289762 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,12 @@ +upstream_project_url: https://github.com/BenHanson/gram_grep +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all diff --git a/sources b/sources new file mode 100644 index 0000000..fefa292 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gram_grep-0.9.0.tar.gz) = cbdb30b8812aa374ac522920d825ceae4c4a630ebd7d6db35f9931fdde2e87bb45fcaf571eff504253c79df90881916b9a1997ddc7fdc07c7a08caa22c77fbab

1 0

Architecture specific change in rpms/gram_grep.git
by githook-noreply＠fedoraproject.org 01 Feb '25

01 Feb '25

1 0

[Report] Packages Restricting Arches
by root 31 Jan '25

31 Jan '25

New package excluding arches (1) ============================ - inspektor-gadget ExcludeArch: ppc64le ppc64 s390x Package that edited their arches constraints (1) ============================================= - ergo was ExcludeArch: %{ix86} is ExcludeArch: %{ix86} ExcludeArch: ppc64le List of packages currently excluding arches (2397) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - 0install ExcludeArch: %{ix86} - 389-ds-base ExcludeArch: i686 - 4ti2 ExcludeArch: %{ix86} - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le riscv64 - AcetoneISO ExcludeArch: ppc %{power64} s390x - Agda ExcludeArch: %{ix86} armv7hl - Agda-stdlib ExcludeArch: armv7hl %{ix86} - BareBonesBrowserLaunch ExclusiveArch: %{java_arches} noarch - CFR ExclusiveArch: %{java_arches} noarch - COPASI ExcludeArch: %{ix86} - CardManager ExclusiveArch: %{java_arches} noarch - CubicSDR ExcludeArch: i686 - CuraEngine ExcludeArch: %{ix86} - CuraEngine_grpc_definitions ExcludeArch: %{ix86} - DSDP ExcludeArch: %{ix86} - E ExcludeArch: %{ix86} - GAPDoc ExcludeArch: %{ix86} - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - HPCombi ExclusiveArch: x86_64 %{arm64} - IPAddress ExclusiveArch: %{java_arches} noarch - IQmol ExcludeArch: %{ix86} - InsightToolkit ExcludeArch: %{ix86} - JUnitParams ExclusiveArch: %{java_arches} noarch - Java-WebSocket ExclusiveArch: %{java_arches} noarch - L-function ExcludeArch: %{ix86} - LabPlot ExcludeArch: s390x - MUSIC ExcludeArch: %{ix86} - Macaulay2 ExcludeArch: %{ix86} ppc64le - Maelstrom ExcludeArch: %{ix86} - Mars ExclusiveArch: %{java_arches} noarch - NiaAML-GUI ExcludeArch: %{ix86} - OpenColorIO ExcludeArch: i686 ExclusiveArch: x86_64 ppc64le - OpenImageIO ExcludeArch: i686 ExclusiveArch: x86_64 ppc64le - OpenMolcas ExclusiveArch: x86_64 aarch64 ppc64le s390x - OpenStego ExclusiveArch: %{java_arches} noarch - Pencil2D ExcludeArch: %{ix86} - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-IRkernel ExcludeArch: %{ix86} - R-V8 ExclusiveArch: %{nodejs_arches} - R-ape ExcludeArch: %{ix86} - R-igraph ExcludeArch: %{ix86} - R-kernlab ExcludeArch: %{ix86} s390x - R-rJava ExclusiveArch: %{java_arches} - Random123 ExcludeArch: mips64r2 mips32r2 s390 - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - Singular ExcludeArch: %{ix86} - TOPCOM ExcludeArch: %{ix86} - VulkanMemoryAllocator ExcludeArch: %{ix86} - YafaRay ExclusiveArch: %{ix86} x86_64 - aardvark-dns ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - abiword ExcludeArch: %{ix86} - accel-config ExclusiveArch: %{ix86} x86_64 - accel-ppp ExcludeArch: %{ix86} - acpica-tools ExcludeArch: i686 armv7hl s390x - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 - act ExcludeArch: %{ix86} - admeshgui ExcludeArch: %{ix86} - aemu ExcludeArch: %{ix86} %{power64} s390x - agenda ExcludeArch: %{ix86} - ahven ExclusiveArch: %{GPRbuild_arches} - algobox ExclusiveArch: %{qt5_qtwebengine_arches} - alienarena ExcludeArch: s390x - alizams ExcludeArch: %{power64} %{ix86} s390x - alt-ergo ExcludeArch: %{ix86} - amdsmi ExclusiveArch: x86_64 - american-fuzzy-lop ExclusiveArch: x86_64 s390x - amg4psblas ExcludeArch: %{ix86} - anaconda ExcludeArch: %{ix86} - android-tools ExcludeArch: ppc ppc64 s390x ppc64le - anet ExclusiveArch: %{GPRbuild_arches} - ansible-collection-microsoft-sql ExcludeArch: i686 - ant ExclusiveArch: %{java_arches} noarch - ant-antunit ExclusiveArch: %{java_arches} noarch - ant-contrib ExclusiveArch: %{java_arches} noarch - antlr ExclusiveArch: %{java_arches} - antlr3 ExclusiveArch: %{java_arches} - antlr4-project ExclusiveArch: %{java_arches} - antlrworks ExclusiveArch: %{java_arches} noarch - aopalliance ExclusiveArch: %{java_arches} noarch - apache-commons-beanutils ExclusiveArch: %{java_arches} noarch - apache-commons-cli ExclusiveArch: %{java_arches} noarch - apache-commons-codec ExclusiveArch: %{java_arches} noarch - apache-commons-collections ExclusiveArch: %{java_arches} noarch - apache-commons-collections4 ExclusiveArch: %{java_arches} noarch - apache-commons-compress ExclusiveArch: %{java_arches} noarch - apache-commons-configuration ExclusiveArch: %{java_arches} noarch - apache-commons-digester ExclusiveArch: %{java_arches} noarch - apache-commons-exec ExclusiveArch: %{java_arches} noarch - apache-commons-io ExclusiveArch: %{java_arches} noarch - apache-commons-jexl ExclusiveArch: %{java_arches} noarch - apache-commons-jxpath ExclusiveArch: %{java_arches} noarch - apache-commons-lang3 ExclusiveArch: %{java_arches} noarch - apache-commons-logging ExclusiveArch: %{java_arches} noarch - apache-commons-math ExclusiveArch: %{java_arches} noarch - apache-commons-modeler ExclusiveArch: %{java_arches} noarch - apache-commons-net ExclusiveArch: %{java_arches} noarch - apache-commons-parent ExclusiveArch: %{java_arches} noarch - apache-commons-pool ExclusiveArch: %{java_arches} noarch - apache-commons-vfs ExclusiveArch: %{java_arches} noarch - apache-ivy ExclusiveArch: %{java_arches} noarch - apache-logging-parent ExclusiveArch: %{java_arches} noarch - apache-parent ExclusiveArch: %{java_arches} noarch - apache-resource-bundles ExclusiveArch: %{java_arches} noarch - apache-sshd ExclusiveArch: %{java_arches} noarch - apiguardian ExclusiveArch: %{java_arches} noarch - appeditor ExcludeArch: %{ix86} - appstream-generator ExclusiveArch: %{ldc_arches} - apricots ExcludeArch: ppc64le aarch64 - apron ExcludeArch: %{ix86} - aquamarine ExcludeArch: %{ix86} - aqute-bnd ExclusiveArch: %{java_arches} noarch - arbor ExcludeArch: mips64r2 mips32r2 s390x %{ix86} - arc-theme ExcludeArch: %{ix86} - argparse ExcludeArch: %{ix86} - args4j ExclusiveArch: %{java_arches} noarch - arianna ExclusiveArch: %{qt6_qtwebengine_arches} - arm-compute-library ExcludeArch: i686 ppc64le s390x - arm-none-eabi-binutils-cs ExcludeArch: %{ix86} - arm-none-eabi-gcc-cs ExcludeArch: %{ix86} - arpwatch ExcludeArch: %{ix86} - asahi-installer ExcludeArch: s390x - asdcplib ExcludeArch: %{ix86} %{arm} - asmjit ExclusiveArch: aarch64 x86_64 - assertj-core ExclusiveArch: %{java_arches} noarch - astromenace ExcludeArch: ppc64 s390x - astrometry ExcludeArch: %{ix86} - asv ExcludeArch: %{ix86} - atlantik ExcludeArch: %{ix86} - atomic-queue ExcludeArch: %{ix86} - aubit4gl ExcludeArch: i686 s390x ppc64le - audacity ExcludeArch: %{ix86} s390x - audiocd-kio ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - aunit ExclusiveArch: %{GPRbuild_arches} - auryn ExcludeArch: %{ix86} - auto ExclusiveArch: %{java_arches} noarch - autolink-java ExclusiveArch: noarch %{java_arches} - avgtime ExclusiveArch: %{ldc_arches} - avr-gcc ExcludeArch: %{ix86} - avrdude ExcludeArch: s390x - aws ExclusiveArch: %{GPRbuild_arches} - aws-c-auth ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-cal ExcludeArch: s390x - aws-c-common ExcludeArch: s390x - aws-c-compression ExcludeArch: s390x - aws-c-event-stream ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-http ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-io ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-mqtt ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-s3 ExcludeArch: %{ix86} ExcludeArch: s390x - aws-c-sdkutils ExcludeArch: s390x - aws-checksums ExcludeArch: s390x - awscli2 ExcludeArch: s390x - azove ExcludeArch: %{ix86} - azure-cli ExclusiveArch: %{java_arches} noarch - batik ExclusiveArch: %{java_arches} noarch - bcal ExclusiveArch: x86_64 aarch64 ppc64le s390x riscv64 - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl riscv64 - bcel ExclusiveArch: %{java_arches} noarch - bcftools ExcludeArch: s390x - bcm283x-firmware ExclusiveArch: aarch64 - beansbinding ExclusiveArch: %{java_arches} noarch - bear ExcludeArch: %{ix86} - bear-factory ExcludeArch: ppc64le - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} riscv64 - beust-jcommander ExclusiveArch: %{java_arches} noarch - bibletime ExclusiveArch: %{java_arches} - bigloo ExcludeArch: %{ix86} - binaryen ExcludeArch: ppc64 s390x - binutils ExcludeArch: aarch64-linux-gnu aarch64-redhat-linux ExcludeArch: ppc64le-linux-gnu ppc64le-redhat-linux ExcludeArch: s390x-linux-gnu s390x-redhat-linux ExcludeArch: x86_64-linux-gnu x86_64-redhat-linux i686-linux-gnu i686-redhat-linux - biosdevname ExclusiveArch: %{ix86} x86_64 - biosig4c++ ExcludeArch: %{ix86} - blender ExcludeArch: %{ix86} %{arm} - bless ExclusiveArch: %mono_arches - bliss ExcludeArch: %{ix86} - bloaty ExcludeArch: %{x86} - blogc ExcludeArch: %{ix86} - bluez-hcidump ExcludeArch: s390 s390x - bochs ExcludeArch: s390x i686 - boinc-client ExcludeArch: s390x - bolzplatz2006 ExclusiveArch: %{java_arches} - bootc ExcludeArch: %{ix86} - bouncycastle ExclusiveArch: %{java_arches} noarch - bout++ ExcludeArch: %{ix86} - bowtie ExcludeArch: i686 armv7hl - bowtie2 ExcludeArch: %{ix86} %{arm} s390x - box64 ExclusiveArch: aarch64 riscv64 ppc64le %{x86_64} - boxes ExcludeArch: %{ix86} - bpfman ExcludeArch: %{ix86} - bpftool ExcludeArch: %{ix86} - bpftop ExcludeArch: %{ix86} - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - brazil ExclusiveArch: %{java_arches} noarch - breakid ExcludeArch: %{ix86} - brewtarget ExcludeArch: %{ix86} - bsf ExclusiveArch: %{java_arches} noarch - bsh ExclusiveArch: %{java_arches} noarch - btrfs-efi ExclusiveArch: %{efi} - build-helper-maven-plugin ExclusiveArch: %{java_arches} noarch - buildah ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - buildbox ExcludeArch: %{ix86} - buildstream ExcludeArch: %{ix86} - buildstream-plugins ExcludeArch: %{ix86} - busybox ExcludeArch: i686 s390x - bvi ExcludeArch: %{ix86} - bwping ExcludeArch: %{ix86} - byebyebios ExclusiveArch: x86_64 - byte-buddy ExclusiveArch: %{java_arches} noarch - byteman ExclusiveArch: %{java_arches} noarch - c4core ExcludeArch: %{ix86} - c4fs ExcludeArch: %{ix86} - c4log ExcludeArch: %{ix86} - cachelib ExclusiveArch: x86_64 aarch64 ppc64le - caddy ExclusiveArch: %{golang_arches} ExclusiveArch: %{golang_arches_future} - cadical ExcludeArch: %{ix86} - calamares ExclusiveArch: %{ix86} x86_64 aarch64 riscv64 - calceph ExcludeArch: %{ix86} - calibre ExclusiveArch: aarch64 x86_64 - calligra ExcludeArch: %{ix86} - cambozola ExclusiveArch: %{java_arches} noarch - canl-java ExclusiveArch: %{java_arches} noarch - cantera ExcludeArch: %{ix86} - carat ExcludeArch: %{ix86} - casc ExcludeArch: %{ix86} - cataclysm-dda ExcludeArch: i686 - catatonit ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - ccdciel ExclusiveArch: %{fpc_arches} ExcludeArch: %{ix86} - ccluster ExcludeArch: %{ix86} - cdcollect ExclusiveArch: %{mono_arches} - cdrdao ExcludeArch: s390 s390x - ceph ExcludeArch: i686 armv7hl ExclusiveArch: x86_64 aarch64 ppc64le s390x - ceres-solver ExcludeArch: ppc64 - cfn-lint ExcludeArch: %{ix86} - cglib ExclusiveArch: %{java_arches} noarch - cgreen ExcludeArch: s390x - chafa ExcludeArch: %{ix86} - chatterino2 ExcludeArch: %{ix86} - chatty ExcludeArch: i686 - checkpointctl ExclusiveArch: %{golang_arches_future} - chez-scheme ExcludeArch: s390x - chibicc ExclusiveArch: x86_64 - chromium ExclusiveArch: x86_64 aarch64 ppc64le ExclusiveArch: x86_64 aarch64 - cinnamon ExcludeArch: %{ix86} - cinnamon-control-center ExcludeArch: %{ix86} - cinnamon-desktop ExcludeArch: %{ix86} - cinnamon-menus ExcludeArch: %{ix86} - cinnamon-screensaver ExcludeArch: %{ix86} - cinnamon-session ExcludeArch: %{ix86} - cinnamon-settings-daemon ExcludeArch: %{ix86} - cjdns ExclusiveArch: %{nodejs_arches} - cjs ExcludeArch: %{ix86} - classloader-leak-test-framework ExclusiveArch: %{java_arches} noarch - classpathless-compiler ExclusiveArch: %{java_arches} noarch - cld2 ExcludeArch: ppc64 s390x - clibs-list ExcludeArch: %{ix86} - clojure ExclusiveArch: %{java_arches} noarch - clojure-core-specs-alpha ExclusiveArch: %{java_arches} noarch - clojure-maven-plugin ExclusiveArch: %{java_arches} noarch - clojure-spec-alpha ExclusiveArch: %{java_arches} noarch - cloudcompare ExcludeArch: %{ix86} - clover2 ExcludeArch: armv7hl - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coan ExcludeArch: ppc64 s390x - coccinelle ExcludeArch: %{ix86} - cockpit ExcludeArch: %{ix86} - cockpit-files ExclusiveArch: %{nodejs_arches} noarch - cockpit-ostree ExcludeArch: %{ix86} - cocoalib ExcludeArch: %{ix86} - codeblocks ExcludeArch: %{ix86} - codehaus-parent ExclusiveArch: %{java_arches} noarch - coeurl ExcludeArch: %{ix86} - cohomCalg ExcludeArch: %{ix86} - coin-or-Bonmin ExcludeArch: %{ix86} - coin-or-HiGHS ExcludeArch: %{ix86} - coin-or-Ipopt ExcludeArch: %{ix86} - coin-or-lemon ExcludeArch: %{ix86} - colorful ExclusiveArch: %{fpc_arches} - colossus ExclusiveArch: %{java_arches} noarch - compiz-plugins-experimental ExcludeArch: s390 s390x - conmon ExclusiveArch: %{golang_arches_future} - console-image-viewer ExclusiveArch: %{java_arches} noarch - containernetworking-plugins ExclusiveArch: %{golang_arches} - containers-common ExclusiveArch: %{golang_arches} noarch - contour-terminal ExclusiveArch: x86_64 aarch64 - contractor ExcludeArch: %{ix86} - conu ExcludeArch: ppc64 - coolreader ExcludeArch: %{ix86} - copr-rpmbuild ExcludeArch: %{ix86} - coq ExclusiveArch: %{ocaml_native_compiler} - corectrl ExcludeArch: %{ix86} - cortado ExclusiveArch: %{java_arches} noarch - cosmic-app-library ExcludeArch: %{ix86} - cosmic-applets ExcludeArch: %{ix86} - cosmic-bg ExcludeArch: %{ix86} - cosmic-comp ExcludeArch: %{ix86} - cosmic-edit ExcludeArch: %{ix86} - cosmic-files ExcludeArch: %{ix86} - cosmic-greeter ExcludeArch: %{ix86} - cosmic-idle ExcludeArch: %{ix86} - cosmic-launcher ExcludeArch: %{ix86} - cosmic-notifications ExcludeArch: %{ix86} - cosmic-osd ExcludeArch: %{ix86} - cosmic-panel ExcludeArch: %{ix86} - cosmic-player ExcludeArch: %{ix86} - cosmic-randr ExcludeArch: %{ix86} - cosmic-screenshot ExcludeArch: %{ix86} - cosmic-session ExcludeArch: %{ix86} - cosmic-settings ExcludeArch: %{ix86} - cosmic-settings-daemon ExcludeArch: %{ix86} - cosmic-store ExcludeArch: %{ix86} - cosmic-term ExcludeArch: %{ix86} - cosmic-workspaces ExcludeArch: %{ix86} - cp2k ExcludeArch: s390x - cpp-hocon ExcludeArch: %{ix86} - cproc ExclusiveArch: aarch64 riscv64 x86_64 - cpu-x ExclusiveArch: i686 x86_64 - cpufetch ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le %{riscv} - cpuid ExclusiveArch: %{ix86} x86_64 - cpuinfo ExclusiveArch: x86_64 aarch64 - cqrlog ExclusiveArch: %{fpc_arches} - cramjam-cli ExcludeArch: %{ix86} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - crash-gcore-command ExclusiveArch: aarch64 ppc64le x86_64 - crash-trace-command ExclusiveArch: aarch64 ppc64le s390x x86_64 - credentials-fetcher ExclusiveArch: x86_64 aarch64 s390x - crest ExcludeArch: s390x - cri-o ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - crosswords ExcludeArch: s390x - crun ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 - cryfs ExcludeArch: i686 - cryptlib ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - crypto-policies ExclusiveArch: %{java_arches} noarch - cryptobone ExclusiveArch: x86_64 ppc64le aarch64 - cryptominisat ExcludeArch: %{ix86} - csdp ExcludeArch: %{ix86} - csslint ExclusiveArch: %{nodejs_arches} noarch - cucumber-messages ExcludeArch: %{ix86} - cura ExcludeArch: %{ix86} - cura-fdm-materials ExcludeArch: %{ix86} - cvc5 ExcludeArch: %{ix86} - cxsc ExcludeArch: %{ix86} - daggy ExcludeArch: s390x - dapl ExcludeArch: s390, armv7hl - daq ExclusiveArch: x86_64 aarch64 - darktable ExcludeArch: armv7hl i686 s390x - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - ddccontrol ExcludeArch: s390 s390x - ddcutil ExcludeArch: s390 s390x - ddd ExcludeArch: %{ix86} - ddnet ExcludeArch: s390x - debugbreak ExcludeArch: %{ix86} - decentxml ExclusiveArch: %{java_arches} noarch - deepin-daemon ExcludeArch: s390x - dhall ExcludeArch: %{ix86} - dhall-json ExcludeArch: %{ix86} - diffoscope ExcludeArch: %{ix86} - digikam ExclusiveArch: %{qt6_qtwebengine_arches} ExclusiveArch: %{qt5_qtwebengine_arches} - dippi ExcludeArch: %{ix86} - directory-maven-plugin ExclusiveArch: %{java_arches} noarch - direwolf ExcludeArch: i686 - dirgra ExclusiveArch: %{java_arches} noarch - disruptor ExclusiveArch: %{java_arches} noarch - ditaa ExclusiveArch: %{java_arches} noarch - dl-fedora ExcludeArch: %{ix86} - dl_poly ExcludeArch: i686 - dlib ExcludeArch: %{ix86} s390x - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 riscv64 - dmtcp ExclusiveArch: x86_64 - dnsdist ExcludeArch: %{ix86} #1994125 ExcludeArch: armv7hl #1994125 - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dogtag-pki ExclusiveArch: %{java_arches} ExcludeArch: i686 - dolfin ExcludeArch: %{ix86} - dolphin-emu ExclusiveArch: x86_64 aarch64 - dom4j ExclusiveArch: %{java_arches} noarch - dosbox-staging ExcludeArch: %{ix86} - dotnet8.0 ExclusiveArch: aarch64 ppc64le s390x x86_64 - dotnet9.0 ExclusiveArch: aarch64 ppc64le s390x x86_64 - doublecmd ExclusiveArch: %{ix86} x86_64 - dovecot ExcludeArch: %{ix86} - dovecot-fts-xapian ExcludeArch: %{ix86} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dragonbox ExcludeArch: %{ix86} - drat-trim ExcludeArch: %{ix86} - drat2er ExcludeArch: %{ix86} - dub ExclusiveArch: %{ldc_arches} - duperemove ExcludeArch: %{ix86} - dvdauthor ExcludeArch: %{ix86} - dvgrab ExcludeArch: s390 s390x - dxvk-native ExclusiveArch: %{ix86} x86_64 - dyninst ExclusiveArch: x86_64 ppc64le aarch64 - e-antic ExcludeArch: %{ix86} - e00compr ExcludeArch: %{ix86} - e3 ExclusiveArch: %{ix86} x86_64 - easymock ExclusiveArch: %{java_arches} noarch - eccodes ExcludeArch: i686 - ecj ExclusiveArch: %{java_arches} noarch - eclipse-swt ExclusiveArch: %{java_arches} - ecryptfs-utils ExcludeArch: %{ix86} - ed25519-java ExclusiveArch: %{java_arches} noarch - edac-utils ExcludeArch: %{ix86} - edflib ExcludeArch: s390x %{ix86} - edwin-fonts ExcludeArch: %{ix86} - eegdev ExcludeArch: %{ix86} - efax ExcludeArch: s390 s390x - efibootmgr ExclusiveArch: %{efi} - efifs ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - electron-cash ExcludeArch: %{ix86} - electrum ExcludeArch: %{ix86} - elementary-icon-theme ExcludeArch: s390x - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 aarch64 %{arm} %{power64} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - emacs-common-proofgeneral ExcludeArch: %{ix86} - emacs-company-mode ExcludeArch: %{ix86} - emacs-iedit ExcludeArch: %{ix86} - emacs-slime ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - embree ExclusiveArch: aarch64 x86_64 - embree3 ExclusiveArch: aarch64 x86_64 - enjarify ExclusiveArch: %{java_arches} noarch - enki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 - eot-utils ExcludeArch: %{ix86} - ergo ExcludeArch: %{ix86} ExcludeArch: ppc64le - eric ExclusiveArch: %{qt6_qtwebengine_arches} noarch - erlang-corba ExclusiveArch: %{java_arches} - erlang-riak_ensemble ExcludeArch: ppc64le - esmi_ib_library ExclusiveArch: x86_64 - espresso ExcludeArch: s390x i686 armv7hl - eth-tools ExclusiveArch: x86_64 - ethos ExcludeArch: %{ix86} - exec-maven-plugin ExclusiveArch: %{java_arches} noarch - external-editor-revived ExclusiveArch: %{rust_arches} - extra-enforcer-rules ExclusiveArch: %{java_arches} noarch - f3d ExcludeArch: %{ix86} - fasterxml-oss-parent ExclusiveArch: %{java_arches} noarch - fastfetch ExcludeArch: %{ix86} - fatcat ExcludeArch: %{ix86} - fb303 ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - fbgemm ExclusiveArch: x86_64 - fbreader ExcludeArch: %{ix86} ExcludeArch: armv7hl - fbthrift ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fcitx5-mozc ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x %{ix86} - fcoe-utils ExcludeArch: ppc s390 ExcludeArch: %{ix86} - feather ExcludeArch: %{arm} %{ix86} - feedbackd ExcludeArch: i686 - felix-parent ExclusiveArch: %{java_arches} noarch - felix-utils ExclusiveArch: %{java_arches} noarch - fernflower ExclusiveArch: %{java_arches} noarch - fex-emu ExclusiveArch: %{arm64} %{x86_64} ExclusiveArch: %{arm64} - fido-device-onboard ExcludeArch: %{ix86} - filedrop ExclusiveArch: %{java_arches} noarch - filezilla ExcludeArch: s390x - firecracker ExclusiveArch: aarch64 x86_64 - firefox ExcludeArch: i686 - fishbowl ExclusiveArch: %{java_arches} noarch - fizz ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - flang ExcludeArch: i686 s390x - flashrom ExcludeArch: s390 s390x - flatbuffers ExcludeArch: %{ix86} - flatpak ExcludeArch: %{ix86} - flatpak-builder ExcludeArch: %{ix86} - flatpak-module-tools ExcludeArch: %{ix86} - fldigi ExcludeArch: i686 - flexmark-java ExclusiveArch: noarch %{java_arches} - flickcurl ExcludeArch: %{ix86} - flint ExcludeArch: %{ix86} - flocq ExclusiveArch: %{ocaml_native_compiler} - floppy-support ExcludeArch: %{arm} aarch64 s390x - florist ExclusiveArch: %{GPRbuild_arches} - flterm ExcludeArch: s390 s390x sparcv9 - fluent-bit ExclusiveArch: x86_64 aarch64 - flute ExclusiveArch: %{java_arches} noarch - fmidi ExcludeArch: %{ix86} - folly ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - fop ExclusiveArch: %{java_arches} noarch - forge-parent ExclusiveArch: %{java_arches} noarch - fotocx ExcludeArch: %{ix86} - foxi ExclusiveArch: x86_64 aarch64 - fpc ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le - fprintd ExcludeArch: s390 s390x - fractal ExcludeArch: %{ix86} - fragments ExcludeArch: %{ix86} - frama-c ExclusiveArch: %{ocaml_native_compiler} - free42 ExcludeArch: %{ix86} - freecol ExclusiveArch: %{java_arches} noarch - freedink ExcludeArch: s390x - freedink-dfarc ExcludeArch: s390x - freedv ExcludeArch: i686 - freefem++ ExcludeArch: %{ix86} - freemarker ExclusiveArch: %{java_arches} noarch - freerouting ExclusiveArch: %{java_arches} noarch - freetennis ExcludeArch: sparc64 s390 s390x %{ix86} - frescobaldi ExclusiveArch: %{qt5_qtwebengine_arches} - frr ExcludeArch: %{ix86} - frysk ExclusiveArch: x86_64 ppc64 - fuse-overlayfs ExclusiveArch: %{arm64} ppc64le s390x x86_64 riscv64 - fusesource-pom ExclusiveArch: %{java_arches} noarch - fwts ExclusiveArch: x86_64 aarch64 riscv64 ppc64le - fwupd-efi ExclusiveArch: x86_64 aarch64 - g4music ExcludeArch: %{ix86} - ga ExcludeArch: %{ix86} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le riscv64 - galera ExcludeArch: %{ix86} - gambas3 ExcludeArch: i686 - gamescope ExcludeArch: ppc64le - gap ExcludeArch: %{ix86} - gap-pkg-4ti2interface ExcludeArch: %{ix86} - gap-pkg-ace ExcludeArch: %{ix86} - gap-pkg-aclib ExcludeArch: %{ix86} - gap-pkg-alnuth ExcludeArch: %{ix86} - gap-pkg-anupq ExcludeArch: %{ix86} - gap-pkg-atlasrep ExcludeArch: %{ix86} - gap-pkg-autodoc ExcludeArch: %{ix86} - gap-pkg-automata ExcludeArch: %{ix86} - gap-pkg-autpgrp ExcludeArch: %{ix86} - gap-pkg-browse ExcludeArch: %{ix86} - gap-pkg-caratinterface ExcludeArch: %{ix86} - gap-pkg-circle ExcludeArch: %{ix86} - gap-pkg-cohomolo ExcludeArch: %{ix86} - gap-pkg-congruence ExcludeArch: %{ix86} - gap-pkg-corelg ExcludeArch: %{ix86} - gap-pkg-crime ExcludeArch: %{ix86} - gap-pkg-crisp ExcludeArch: %{ix86} - gap-pkg-crypting ExcludeArch: %{ix86} - gap-pkg-cryst ExcludeArch: %{ix86} - gap-pkg-crystcat ExcludeArch: %{ix86} - gap-pkg-ctbllib ExcludeArch: %{ix86} - gap-pkg-curlinterface ExcludeArch: %{ix86} - gap-pkg-cvec ExcludeArch: %{ix86} - gap-pkg-datastructures ExcludeArch: %{ix86} - gap-pkg-design ExcludeArch: %{ix86} - gap-pkg-digraphs ExcludeArch: %{ix86} - gap-pkg-edim ExcludeArch: %{ix86} - gap-pkg-factint ExcludeArch: %{ix86} - gap-pkg-ferret ExcludeArch: %{ix86} - gap-pkg-fga ExcludeArch: %{ix86} - gap-pkg-fining ExcludeArch: %{ix86} - gap-pkg-float ExcludeArch: %{ix86} - gap-pkg-format ExcludeArch: %{ix86} - gap-pkg-forms ExcludeArch: %{ix86} - gap-pkg-fplsa ExcludeArch: %{ix86} - gap-pkg-fr ExcludeArch: %{ix86} - gap-pkg-francy ExcludeArch: %{ix86} - gap-pkg-gbnp ExcludeArch: %{ix86} - gap-pkg-genss ExcludeArch: %{ix86} - gap-pkg-grape ExcludeArch: %{ix86} - gap-pkg-groupoids ExcludeArch: %{ix86} - gap-pkg-grpconst ExcludeArch: %{ix86} - gap-pkg-guava ExcludeArch: %{ix86} - gap-pkg-hap ExcludeArch: %{ix86} - gap-pkg-hapcryst ExcludeArch: %{ix86} - gap-pkg-hecke ExcludeArch: %{ix86} - gap-pkg-idrel ExcludeArch: %{ix86} - gap-pkg-images ExcludeArch: %{ix86} - gap-pkg-io ExcludeArch: %{ix86} - gap-pkg-irredsol ExcludeArch: %{ix86} - gap-pkg-json ExcludeArch: %{ix86} - gap-pkg-jupyterkernel ExcludeArch: %{ix86} - gap-pkg-jupyterviz ExcludeArch: %{ix86} - gap-pkg-kbmag ExcludeArch: %{ix86} - gap-pkg-laguna ExcludeArch: %{ix86} - gap-pkg-liealgdb ExcludeArch: %{ix86} - gap-pkg-liepring ExcludeArch: %{ix86} - gap-pkg-liering ExcludeArch: %{ix86} - gap-pkg-lins ExcludeArch: %{ix86} - gap-pkg-loops ExcludeArch: %{ix86} - gap-pkg-lpres ExcludeArch: %{ix86} - gap-pkg-mapclass ExcludeArch: %{ix86} - gap-pkg-nautytracesinterface ExcludeArch: %{ix86} - gap-pkg-normalizinterface ExcludeArch: %{ix86} - gap-pkg-nq ExcludeArch: %{ix86} - gap-pkg-numericalsgps ExcludeArch: %{ix86} - gap-pkg-openmath ExcludeArch: %{ix86} - gap-pkg-orb ExcludeArch: %{ix86} - gap-pkg-permut ExcludeArch: %{ix86} - gap-pkg-polenta ExcludeArch: %{ix86} - gap-pkg-polycyclic ExcludeArch: %{ix86} - gap-pkg-polymaking ExcludeArch: %{ix86} - gap-pkg-primgrp ExcludeArch: %{ix86} - gap-pkg-profiling ExcludeArch: %{ix86} - gap-pkg-qpa ExcludeArch: %{ix86} - gap-pkg-quagroup ExcludeArch: %{ix86} - gap-pkg-radiroot ExcludeArch: %{ix86} - gap-pkg-recog ExcludeArch: %{ix86} - gap-pkg-repsn ExcludeArch: %{ix86} - gap-pkg-resclasses ExcludeArch: %{ix86} - gap-pkg-scscp ExcludeArch: %{ix86} - gap-pkg-semigroups ExcludeArch: %{ix86} - gap-pkg-singular ExcludeArch: %{ix86} - gap-pkg-sla ExcludeArch: %{ix86} - gap-pkg-smallgrp ExcludeArch: %{ix86} - gap-pkg-smallsemi ExcludeArch: %{ix86} - gap-pkg-sonata ExcludeArch: %{ix86} - gap-pkg-sophus ExcludeArch: %{ix86} - gap-pkg-spinsym ExcludeArch: %{ix86} - gap-pkg-standardff ExcludeArch: %{ix86} - gap-pkg-tomlib ExcludeArch: %{ix86} - gap-pkg-toric ExcludeArch: %{ix86} - gap-pkg-transgrp ExcludeArch: %{ix86} - gap-pkg-typeset ExcludeArch: %{ix86} - gap-pkg-utils ExcludeArch: %{ix86} - gap-pkg-uuid ExcludeArch: %{ix86} - gap-pkg-xmod ExcludeArch: %{ix86} - gap-pkg-zeromqinterface ExcludeArch: %{ix86} - gappa ExcludeArch: %{ix86} - gappalib-coq ExclusiveArch: %{ocaml_native_compiler} - gauche ExcludeArch: armv7hl - gbrainy ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gdb-gef ExclusiveArch: x86_64 - gdl ExcludeArch: %{ix86} - gearhead1 ExclusiveArch: %{fpc_arches} - gearhead2 ExclusiveArch: %{fpc_arches} - geeqie ExcludeArch: %{ix86} - geopmd ExclusiveArch: x86_64 - getdp ExcludeArch: %{ix86} - gfan ExcludeArch: %{ix86} - gfs2-utils ExcludeArch: %{ix86} - gfxstream ExcludeArch: %{ix86} %{power64} s390x - ghc-cborg ExcludeArch: %{ix86} - ghc-cborg-json ExcludeArch: %{ix86} - ghc-gi-gtk ExcludeArch: armv7hl - ghc-serialise ExcludeArch: %{ix86} - ghc9.2 ExcludeArch: armv7hl - ghdl ExclusiveArch: %{GNAT_arches} ExcludeArch: armv7hl %{ix86} - ghostwriter ExclusiveArch: %{qt6_qtwebengine_arches} - gimp ExcludeArch: s390x - gimp-data-extras ExcludeArch: s390x - gimp-fourier-plugin ExcludeArch: %{ix86} s390x - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-lfs ExcludeArch: %{ix86} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gitqlient ExclusiveArch: %{qt5_qtwebengine_arches} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gkrellm-wifi ExcludeArch: s390 s390x - glava ExcludeArch: %{ix86} - glibd ExclusiveArch: %{ldc_arches} - gloo ExcludeArch: i686 - glow ExclusiveArch: %{golang_arches_future} - glsl-analyzer ExclusiveArch: %{zig_arches} - glycin ExcludeArch: %{ix86} - gmic ExcludeArch: s390x - gmsh ExcludeArch: %{ix86} - gmult ExcludeArch: %{ix86} - gn ExcludeArch: %{ix86} - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnatcoll-db ExclusiveArch: %{GPRbuild_arches} - gnofract4d ExcludeArch: %{ix86} - gnome-applets ExcludeArch: %{ix86} - gnome-bluetooth ExcludeArch: s390 s390x - gnome-bluetooth3.34 ExcludeArch: s390 s390x - gnome-boxes ExclusiveArch: x86_64 - gnome-chemistry-utils ExcludeArch: %{ix86} - gnome-console ExcludeArch: %{ix86} - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches ExcludeArch: armv7hl - gnome-flashback ExcludeArch: %{ix86} - gnome-hexgl ExcludeArch: i686 - gnome-initial-setup ExcludeArch: %{ix86} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-monitor-config ExcludeArch: %{ix86} - gnome-panel ExcludeArch: %{ix86} - gnome-rdp ExclusiveArch: %{mono_arches} ExcludeArch: %{ix86} - gnome-session ExcludeArch: %{ix86} - gnome-sharp ExclusiveArch: %mono_arches - gnome-shell ExcludeArch: %{ix86} - gnome-software ExcludeArch: %{ix86} - gnome-subtitles ExclusiveArch: %mono_arches - gnome-terminal ExcludeArch: %{ix86} - gnu-efi ExclusiveArch: %{efi} - gnucash ExcludeArch: %{ix86} ExcludeArch: ppc64 s390x - gnumeric ExcludeArch: %{ix86} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - godot ExcludeArch: s390x - godot3 ExcludeArch: ppc64 ppc64le s390x - goffice ExcludeArch: %{ix86} - golang ExclusiveArch: %{golang_arches} - golang-entgo-ent ExcludeArch: %{arm32} %{ix86} - golang-github-ebitengine-purego ExcludeArch: ppc64le s390x - golang-github-elliotchance-orderedmap ExcludeArch: aarch64 ExcludeArch: ppc64le ExcludeArch: s390x - golang-github-facebookincubator-nvdtools ExcludeArch: i686 armv7hl - golang-github-google-goterm ExcludeArch: ppc64le s390x - golang-github-hetznercloud-hcloud ExcludeArch: ppc64le s390x - golang-github-vultr-govultr-3 ExcludeArch: ppc64le s390x - goldendict-ng ExclusiveArch: aarch64 x86_64 - google-compute-engine-guest-configs ExcludeArch: %{ix86} - google-cpu_features ExcludeArch: s390x - google-gson ExclusiveArch: %{java_arches} noarch - google-guest-agent ExcludeArch: ppc64le s390x - google-guice ExclusiveArch: %{java_arches} noarch - google-osconfig-agent ExcludeArch: ppc64le s390x - gotcha ExcludeArch: %{ix86} - gotify-desktop ExcludeArch: %{ix86} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gource ExcludeArch: ppc64le - goverlay ExclusiveArch: %{fpc_arches} - gpaste ExcludeArch: %{ix86} - gpaw ExcludeArch: ppc64 ExcludeArch: %{ix86} - gperftools ExcludeArch: s390 - gprbuild ExclusiveArch: %{GPRbuild_arches} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64 - gr-air-modes ExcludeArch: %{ix86} - grafana ExclusiveArch: %{grafana_arches} - grafana-pcp ExclusiveArch: %{grafanapcp_arches} - greenboot ExcludeArch: s390x - gretl ExcludeArch: %{ix86} - gromacs ExcludeArch: i686 armv7hl s390x - grout ExcludeArch: %{ix86} ExcludeArch: s390x - grub2 ExcludeArch: s390 s390x %{ix86} - grub2-breeze-theme ExcludeArch: s390 s390x %{arm} - grubby ExcludeArch: %{ix86} - gsequencer ExcludeArch: i686 - gst-vosk ExclusiveArch: x86_64 aarch64 ppc64le - gthree ExcludeArch: i686 - gthumb ExcludeArch: s390x - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gtkhash ExcludeArch: %{ix86} - gtkwave ExcludeArch: s390x - gtypist ExcludeArch: %{ix86} - guava ExclusiveArch: %{java_arches} noarch - gudev-sharp ExclusiveArch: %mono_arches - guestfs-tools ExclusiveArch: %{kernel_arches} ExcludeArch: %{power64} - gum ExclusiveArch: %{golang_arches_future} - gvisor-tap-vsock ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - hamcrest ExclusiveArch: %{java_arches} noarch - hamlib ExcludeArch: i686 - harec ExclusiveArch: x86_64 aarch64 riscv64 - harmonyseq ExcludeArch: %{ix86} - hashcat ExcludeArch: %{ix86} ppc64 s390x - hawtjni ExclusiveArch: %{java_arches} noarch - haxe ExcludeArch: %{ix86} - hcloud ExcludeArch: %{ix86} ppc64le s390x - hdhomerun ExcludeArch: %{ix86} - heaptrack ExcludeArch: s390 s390x - hedgewars ExclusiveArch: %{fpc_arches} ExcludeArch: ppc64le - heffte ExcludeArch: %{ix86} s390x - helix ExcludeArch: %{ix86} - hevea ExcludeArch: %{ix86} - hibernate-jpa-2.0-api ExclusiveArch: %{java_arches} noarch - hid4java ExclusiveArch: %{java_arches} noarch - highfive ExcludeArch: %{ix86} - hipblas ExclusiveArch: x86_64 - hipblas-common ExclusiveArch: x86_64 - hipblaslt ExclusiveArch: x86_64 - hipcub ExclusiveArch: x86_64 - hipfft ExclusiveArch: x86_64 - hipfort ExclusiveArch: x86_64 - hipify ExclusiveArch: x86_64 - hiprand ExclusiveArch: x86_64 - hiprt ExclusiveArch: x86_64 - hipsolver ExclusiveArch: x86_64 - hipsparse ExclusiveArch: x86_64 - hmmer ExcludeArch: aarch64 ppc64le s390x - honggfuzz ExcludeArch: %{arm} %{power64} s390 s390x - howl ExcludeArch: ppc64le s390x ExcludeArch: %{ix86} - hpx ExcludeArch: i686 - httpcomponents-client ExclusiveArch: %{java_arches} noarch - httpcomponents-core ExclusiveArch: %{java_arches} noarch - httpcomponents-project ExclusiveArch: %{java_arches} noarch - hyperhdr ExcludeArch: %{ix86} - hyperrogue ExcludeArch: armv7hl - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 aarch64 - hyprland ExcludeArch: %{ix86} - hyprlang ExcludeArch: %{ix86} - hyprutils ExcludeArch: %{ix86} - hyprwayland-scanner ExcludeArch: %{ix86} - i2c-tools ExcludeArch: s390 s390x - ibsim ExcludeArch: s390 %{arm} - ibus-typing-booster ExcludeArch: ppc64 s390x - icecat ExcludeArch: %{ix86} %{arm} - icedtea-web ExclusiveArch: %{java_arches} - icu4j ExclusiveArch: %{java_arches} noarch - ignition ExcludeArch: %{ix86} - iir1 ExcludeArch: %{ix86} - ike-scan ExcludeArch: %{ix86} - ilua ExcludeArch: %{ix86} - image-builder ExcludeArch: i686 - imagej ExclusiveArch: %{java_arches} noarch - imaptest ExcludeArch: %{ix86} - imhex ExclusiveArch: x86_64 %{arm64} - iml ExcludeArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indi-3rdparty-drivers ExcludeArch: %{ix86} - indi-3rdparty-libraries ExcludeArch: %{ix86} - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - inspektor-gadget ExcludeArch: ppc64le ppc64 s390x - intel-cmt-cat ExclusiveArch: x86_64 - intel-compute-runtime ExclusiveArch: x86_64 - intel-gmmlib ExcludeArch: s390x ppc64le - intel-igc ExclusiveArch: x86_64 - intel-ipp-crypto-mb ExclusiveArch: x86_64 - intel-ipsec-mb ExclusiveArch: x86_64 - intel-lpmd ExclusiveArch: x86_64 - intel-media-driver-free ExclusiveArch: i686 x86_64 - intel-mediasdk ExclusiveArch: x86_64 - intel-metee ExclusiveArch: x86_64 - intel-mpi-benchmarks ExcludeArch: %{ix86} - intel-qpl ExclusiveArch: x86_64 - intel-undervolt ExclusiveArch: i386 x86_64 - intel-vpl-gpu-rt ExclusiveArch: x86_64 - ioport ExclusiveArch: %{ix86} x86_64 - ipe ExcludeArch: %{ix86} - ipmctl ExclusiveArch: x86_64 - iprutils ExclusiveArch: ppc64le - irda-utils ExcludeArch: s390 s390x - irqbalance ExcludeArch: s390 s390x - isa-l ExcludeArch: %{ix86} - ispc ExclusiveArch: x86_64 aarch64 - itinerary ExcludeArch: %{ix86} - ittapi ExclusiveArch: x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExcludeArch: %{ix86} - iyfct ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - jFormatString ExclusiveArch: %{java_arches} noarch - jack-mixer ExcludeArch: armv7hl ExcludeArch: i686 - jackson-annotations ExclusiveArch: %{java_arches} noarch - jackson-bom ExclusiveArch: %{java_arches} noarch - jackson-core ExclusiveArch: %{java_arches} noarch - jackson-databind ExclusiveArch: %{java_arches} noarch - jackson-jaxrs-providers ExclusiveArch: %{java_arches} noarch - jackson-modules-base ExclusiveArch: %{java_arches} noarch - jackson-parent ExclusiveArch: %{java_arches} noarch - jacoco ExclusiveArch: %{java_arches} noarch - jakarta-activation ExclusiveArch: %{java_arches} noarch - jakarta-activation1 ExclusiveArch: %{java_arches} noarch - jakarta-annotations ExclusiveArch: %{java_arches} noarch - jakarta-cdi ExclusiveArch: %{java_arches} noarch - jakarta-cdi2.0 ExclusiveArch: %{java_arches} noarch - jakarta-el ExclusiveArch: %{java_arches} noarch - jakarta-inject ExclusiveArch: %{java_arches} noarch - jakarta-inject1.0 ExclusiveArch: %{java_arches} noarch - jakarta-interceptors ExclusiveArch: %{java_arches} noarch - jakarta-json ExclusiveArch: %{java_arches} noarch - jakarta-mail ExclusiveArch: %{java_arches} noarch - jakarta-mail1 ExclusiveArch: %{java_arches} noarch - jakarta-oro ExclusiveArch: %{java_arches} noarch - jakarta-saaj ExclusiveArch: %{java_arches} noarch - jakarta-server-pages ExclusiveArch: %{java_arches} noarch - jakarta-servlet ExclusiveArch: %{java_arches} noarch - jakarta-xml-ws ExclusiveArch: %{java_arches} noarch - janino ExclusiveArch: %{java_arches} noarch - jansi ExclusiveArch: %{java_arches} - jansi-native ExclusiveArch: %{java_arches} - jansi1 ExclusiveArch: %{java_arches} noarch - java-21-openjdk ExclusiveArch: %{java_arches} ExcludeArch: %{ix86} - java-21-openjdk-portable ExclusiveArch: %{java_arches} ExcludeArch: %{ix86} - java-diff-utils ExclusiveArch: %{java_arches} noarch - java-jd-decompiler ExclusiveArch: %{java_arches} noarch - java-latest-openjdk ExclusiveArch: %{java_arches} ExcludeArch: %{ix86} - java-latest-openjdk-portable ExclusiveArch: %{java_arches} ExcludeArch: %{ix86} - java-runtime-decompiler ExclusiveArch: %{java_arches} noarch - java-scrypt ExclusiveArch: %{java_arches} noarch - java_cup ExclusiveArch: %{java_arches} noarch - javacc ExclusiveArch: %{java_arches} noarch - javacc-maven-plugin ExclusiveArch: %{java_arches} noarch - javaewah ExclusiveArch: %{java_arches} noarch - javapackages-bootstrap ExclusiveArch: %{java_arches} - javaparser ExclusiveArch: %{java_arches} noarch - javapoet ExclusiveArch: %{java_arches} noarch - javassist ExclusiveArch: %{java_arches} noarch - jaxb ExclusiveArch: %{java_arches} noarch - jaxb-api ExclusiveArch: %{java_arches} noarch - jaxb-api2 ExclusiveArch: %{java_arches} noarch - jaxb-dtd-parser ExclusiveArch: %{java_arches} noarch - jaxb-fi ExclusiveArch: %{java_arches} noarch - jaxb-istack-commons ExclusiveArch: %{java_arches} noarch - jaxb-stax-ex ExclusiveArch: %{java_arches} noarch - jaxen ExclusiveArch: %{java_arches} noarch - jblas ExcludeArch: %{ix86} - jboss-jaxrs-2.0-api ExclusiveArch: %{java_arches} noarch - jboss-logging ExclusiveArch: %{java_arches} noarch - jboss-logging-tools ExclusiveArch: %{java_arches} noarch - jboss-parent ExclusiveArch: %{java_arches} noarch - jchardet ExclusiveArch: %{java_arches} noarch - jcip-annotations ExclusiveArch: %{java_arches} noarch - jctools ExclusiveArch: %{java_arches} noarch - jcuber ExclusiveArch: %{java_arches} noarch - jdeparser ExclusiveArch: %{java_arches} noarch - jdepend ExclusiveArch: %{java_arches} noarch - jdependency ExclusiveArch: %{java_arches} noarch - jdom ExclusiveArch: %{java_arches} noarch - jdom2 ExclusiveArch: %{java_arches} noarch - jedit ExclusiveArch: %{java_arches} noarch - jericho-html ExclusiveArch: %{java_arches} noarch - jetbrains-annotations ExclusiveArch: noarch %{java_arches} - jetty ExclusiveArch: %{java_arches} noarch - jflex ExclusiveArch: %{java_arches} noarch - jfreechart ExclusiveArch: %{java_arches} noarch - jglobus ExclusiveArch: %{java_arches} noarch - jgoodies-common ExclusiveArch: %{java_arches} noarch - jgoodies-forms ExclusiveArch: %{java_arches} noarch - jgoodies-looks ExclusiveArch: %{java_arches} noarch - jigawatts ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - jline ExclusiveArch: %{java_arches} - jline2 ExclusiveArch: %{java_arches} noarch - jmock ExclusiveArch: %{java_arches} noarch - jna ExclusiveArch: %{java_arches} - jneuroml-core ExclusiveArch: %{java_arches} noarch - jo ExcludeArch: %{ix86} - jol ExclusiveArch: %{java_arches} noarch - jopt-simple ExclusiveArch: %{java_arches} noarch - jorbis ExclusiveArch: %{java_arches} noarch - jowl ExclusiveArch: %{nodejs_arches} noarch - jpanoramamaker ExclusiveArch: %{java_arches} noarch - jpilot ExcludeArch: s390, s390x - jpilot-backup ExcludeArch: s390 s390x - js8call ExcludeArch: i686 - jsch ExclusiveArch: %{java_arches} noarch - jsch-agent-proxy ExclusiveArch: %{java_arches} noarch - json_simple ExclusiveArch: %{java_arches} noarch - jsonnet ExcludeArch: %{ix86} - jsoup ExclusiveArch: %{java_arches} noarch - jsr-305 ExclusiveArch: %{java_arches} noarch - jss ExclusiveArch: %{java_arches} ExcludeArch: i686 - jssc ExclusiveArch: %{java_arches} - jtidy ExclusiveArch: %{java_arches} noarch - julia ExclusiveArch: x86_64 - junit ExclusiveArch: %{java_arches} noarch - junit5 ExclusiveArch: %{java_arches} noarch - juniversalchardet ExclusiveArch: %{java_arches} noarch - jzlib ExclusiveArch: %{java_arches} noarch - k2hash ExcludeArch: i686 armv7hl - kaffeine ExcludeArch: %{ix86} - kaidan ExclusiveArch: %{qt5_qtwebengine_arches} ExcludeArch: %{ix86} - kata-containers ExcludeArch: %{arm} %{ix86} s390 s390x ExcludeArch: ppc64le - kawa ExcludeArch: i686 - kchmviewer ExclusiveArch: %{qt5_qtwebengine_arches} - kcm_wacomtablet ExcludeArch: s390 s390x - kcov ExcludeArch: s390 s390x - kdenlive ExcludeArch: %{ix86} - kdepim-addons ExcludeArch: %{ix86} - kdevelop ExclusiveArch: %{qt6_qtwebengine_arches} - kdevelop-php ExclusiveArch: %{qt6_qtwebengine_arches} - keepass ExclusiveArch: %{mono_arches} ExcludeArch: armv7hl - keepassxc ExcludeArch: s390x - kefir ExclusiveArch: x86_64 - kernel ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le riscv64 ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le - kernelshark ExcludeArch: %{ix86} %{arm} - keydb ExcludeArch: %{ix86} - keylime-agent-rust ExclusiveArch: %{rust_arches} - kf5-akonadi-search ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kblog ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarcore ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarutils ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kitinerary ExcludeArch: %{ix86} ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-ktnef ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-libkdcraw ExclusiveArch: x86_64 ppc64le %{arm} - khelpcenter ExclusiveArch: %{qt6_qtwebengine_arches} - kicad ExclusiveArch: x86_64 aarch64 ppc64le - kissat ExcludeArch: %{ix86} - kitinerary ExcludeArch: %{ix86} - kitty ExcludeArch: %{ix86} - kiwix-desktop ExclusiveArch: %{qt5_qtwebengine_arches} - klog ExcludeArch: i686 - kmymoney ExclusiveArch: %{qt5_qtwebengine_arches} - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kokkos ExcludeArch: i686 armv7hl - kpilot ExcludeArch: s390 s390x - krita ExcludeArch: %{ix86} - kstars ExcludeArch: %{ix86} - l10n-maven-plugin ExclusiveArch: %{java_arches} noarch - ladspa-autotalent-plugins ExcludeArch: %{ix86} - lammps ExcludeArch: %{ix86} s390x - latte-integrale ExcludeArch: %{ix86} - lazarus ExclusiveArch: %{fpc_arches} - lazpaint ExclusiveArch: %{fpc_arches} - lcd4linux ExcludeArch: s390 s390x - ldapjdk ExclusiveArch: %{java_arches} noarch - ldc ExclusiveArch: %{ldc_arches} ppc64le - ledmon ExcludeArch: %{ix86} - leland-fonts ExcludeArch: %{ix86} - lfortran ExclusiveArch: x86_64 - lfsc ExcludeArch: %{ix86} - lib3mf ExcludeArch: %{ix86} - libCombine ExcludeArch: %{ix86} - libahp-gt ExcludeArch: %{ix86} - libaiff ExcludeArch: %{ix86} - libarcus ExcludeArch: %{ix86} - libarrow ExcludeArch: %{ix86} %{arm} - libavc1394 ExcludeArch: s390 s390x - libbase ExclusiveArch: %{java_arches} noarch - libbraiding ExcludeArch: %{ix86} - libcamera ExcludeArch: s390x ppc64le - libcamera-apps ExcludeArch: %{power64} s390x - libcint ExcludeArch: %{power64} ExcludeArch: x86_64 - libcircle ExcludeArch: %{ix86} - libcpuid ExcludeArch: ppc64le s390x - libcrystalhd ExcludeArch: s390 s390x - libdc1394 ExcludeArch: s390 s390x - libdfp ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64 - libdigidocpp ExcludeArch: %{ix86} - libdispatch ExclusiveArch: x86_64 aarch64 ppc64le - libffado ExcludeArch: s390 s390x - libfilezilla ExcludeArch: s390x - libfonts ExclusiveArch: %{java_arches} noarch - libformula ExclusiveArch: %{java_arches} noarch - libfplll ExcludeArch: %{ix86} - libfprint ExcludeArch: s390 s390x - libgeopm ExclusiveArch: x86_64 - libgeopmd ExclusiveArch: x86_64 - libguestfs ExcludeArch: %{ix86} ExclusiveArch: %{kernel_arches} ExcludeArch: %{power64} - libibcommon ExcludeArch: s390 s390x - libica ExclusiveArch: s390 s390x - libiec61883 ExcludeArch: s390 s390x - libindi ExcludeArch: %{ix86} - libinsane ExcludeArch: %{ix86} - libint2 ExcludeArch: %{ix86} - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libirc ExcludeArch: i686 - libkrun ExclusiveArch: x86_64 aarch64 - libkrunfw ExclusiveArch: x86_64 aarch64 - liblayout ExclusiveArch: %{java_arches} noarch - libldac ExcludeArch: s390x - libloader ExclusiveArch: %{java_arches} noarch - libnuml ExcludeArch: %{ix86} - libnxt ExcludeArch: %{ix86} - libnxz ExclusiveArch: ppc64le - libobjc2 ExcludeArch: armv7hl i686 ppc64le s390x - libocxl ExclusiveArch: ppc64le - libomp17 ExcludeArch: s390x - libopenshot ExcludeArch: ppc64le - libopenshot-audio ExcludeArch: ppc64le - liborc ExcludeArch: i686 armv7hl - libpasastro ExcludeArch: %{ix86} - libpoly ExcludeArch: %{ix86} - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - libraw1394 ExcludeArch: s390 s390x - libreoffice ExcludeArch: %{ix86} - libreoffice-TexMaths ExclusiveArch: %{java_arches} ExcludeArch: aarch64 s390x - librepository ExclusiveArch: %{java_arches} noarch - libretro-desmume2015 ExclusiveArch: i686 x86_64 - libretro-pcsx-rearmed ExcludeArch: armv7hl - librtas ExclusiveArch: %{power64} - libsavitar ExcludeArch: %{ix86} - libsedml ExcludeArch: %{ix86} - libsemigroups ExcludeArch: %{ix86} - libserializer ExclusiveArch: %{java_arches} noarch - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libsonata ExcludeArch: %{ix86} - libstoragemgmt ExcludeArch: %{ix86} - libsurvive ExcludeArch: %{ix86} - libtpcmisc ExcludeArch: %{ix86} - libtracecmd ExcludeArch: %{ix86} %{arm} - libunibreak ExcludeArch: %{ix86} - libunicode ExclusiveArch: x86_64 aarch64 - libunifex ExcludeArch: i686 - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 riscv64 - libva-nvidia-driver ExclusiveArch: x86_64 aarch64 %{ix86} ppc64le - libvirt-java ExclusiveArch: %{java_arches} noarch - libvma ExclusiveArch: x86_64 ppc64le ppc64 aarch64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libvpl ExclusiveArch: x86_64 - libvpl-tools ExclusiveArch: x86_64 - libx86 ExcludeArch: ppc %{power64} s390 s390x %{sparc} aarch64 armv7hl - libxsmm ExclusiveArch: x86_64 - libzdnn ExclusiveArch: s390x - libzfcphbaapi ExclusiveArch: s390 s390x - libzpc ExclusiveArch: s390x - liferea ExcludeArch: %{ix86} - linbox ExcludeArch: %{ix86} - linux-system-roles ExcludeArch: i686 - liquid-dsp ExcludeArch: i686 - liquidctl ExcludeArch: s390 s390x - lite-xl ExcludeArch: %{ix86} - llama-cpp ExclusiveArch: x86_64 aarch64 - lld13 ExcludeArch: s390x - lld15 ExcludeArch: s390x - lld17 ExcludeArch: s390x - llhttp ExclusiveArch: %{nodejs_arches} - llvm-bolt ExcludeArch: s390x ppc64le i686 - log4j ExclusiveArch: %{java_arches} noarch - log4net ExclusiveArch: %mono_arches - loguru ExcludeArch: %{ix86} - loupe ExcludeArch: %{ix86} - love ExcludeArch: ppc ppc64 s390x - lrmi ExclusiveArch: %{ix86} - lrslib ExcludeArch: %{ix86} - lsp-plugins ExcludeArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExcludeArch: riscv64 ppc64 ppc64le - lucene ExclusiveArch: %{java_arches} noarch - luckybackup ExcludeArch: %{ix86} - lujavrite ExclusiveArch: %{java_arches} - luminance-hdr ExcludeArch: %{ix86} - lusol ExcludeArch: %{ix86} - luxcorerender ExclusiveArch: x86_64 - lzfse ExcludeArch: s390x - m4ri ExcludeArch: %{ix86} - m4rie ExcludeArch: %{ix86} - magicmirror ExclusiveArch: %{nodejs_arches} noarch - magicmirror-module-airnow ExclusiveArch: %{nodejs_arches} noarch - magicmirror-module-onthisday ExclusiveArch: %{nodejs_arches} noarch - magicmirror-module-singlestock ExclusiveArch: %{nodejs_arches} noarch - magma ExclusiveArch: x86_64 - makemusic-finale-fonts ExcludeArch: %{ix86} - mame ExcludeArch: %{arm} %{ix86} - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - mapnik ExcludeArch: ppc ppc64 s390 s390x - marcsabatella-campania-fonts ExcludeArch: %{ix86} - mariadb-java-client ExclusiveArch: %{java_arches} noarch - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - mate-applets ExcludeArch: i386 i686 - mathic ExcludeArch: %{ix86} - mathicgb ExcludeArch: %{ix86} - matrix-synapse ExclusiveArch: %{rust_arches} - maui-mauikit-imagetools ExcludeArch: %{ix86} - maui-mauikit-pix ExcludeArch: %{ix86} - maven ExclusiveArch: %{java_arches} noarch - maven-antrun-plugin ExclusiveArch: %{java_arches} noarch - maven-archetype ExclusiveArch: %{java_arches} noarch - maven-archiver ExclusiveArch: %{java_arches} noarch - maven-artifact-transfer ExclusiveArch: %{java_arches} noarch - maven-assembly-plugin ExclusiveArch: %{java_arches} noarch - maven-bundle-plugin ExclusiveArch: %{java_arches} noarch - maven-clean-plugin ExclusiveArch: %{java_arches} noarch - maven-common-artifact-filters ExclusiveArch: %{java_arches} noarch - maven-compiler-plugin ExclusiveArch: %{java_arches} noarch - maven-dependency-analyzer ExclusiveArch: %{java_arches} noarch - maven-dependency-plugin ExclusiveArch: %{java_arches} noarch - maven-dependency-tree ExclusiveArch: %{java_arches} noarch - maven-doxia ExclusiveArch: %{java_arches} noarch - maven-doxia-sitetools ExclusiveArch: %{java_arches} noarch - maven-enforcer ExclusiveArch: %{java_arches} noarch - maven-file-management ExclusiveArch: %{java_arches} noarch - maven-filtering ExclusiveArch: %{java_arches} noarch - maven-invoker ExclusiveArch: %{java_arches} noarch - maven-invoker-plugin ExclusiveArch: %{java_arches} noarch - maven-jar-plugin ExclusiveArch: %{java_arches} noarch - maven-mapping ExclusiveArch: %{java_arches} noarch - maven-native ExclusiveArch: %{java_arches} noarch - maven-parent ExclusiveArch: %{java_arches} noarch - maven-patch-plugin ExclusiveArch: %{java_arches} noarch - maven-plugin-testing ExclusiveArch: %{java_arches} noarch - maven-plugin-tools ExclusiveArch: %{java_arches} noarch - maven-remote-resources-plugin ExclusiveArch: %{java_arches} noarch - maven-reporting-api ExclusiveArch: %{java_arches} noarch - maven-reporting-impl ExclusiveArch: %{java_arches} noarch - maven-resolver ExclusiveArch: %{java_arches} noarch - maven-resources-plugin ExclusiveArch: %{java_arches} noarch - maven-script-interpreter ExclusiveArch: %{java_arches} noarch - maven-shade-plugin ExclusiveArch: %{java_arches} noarch - maven-shared-incremental ExclusiveArch: %{java_arches} noarch - maven-shared-io ExclusiveArch: %{java_arches} noarch - maven-shared-utils ExclusiveArch: %{java_arches} noarch - maven-source-plugin ExclusiveArch: %{java_arches} noarch - maven-surefire ExclusiveArch: %{java_arches} noarch - maven-verifier ExclusiveArch: %{java_arches} noarch - maven-verifier-plugin ExclusiveArch: %{java_arches} noarch - maven-wagon ExclusiveArch: %{java_arches} noarch - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mbpfan ExclusiveArch: x86_64 - mcelog ExclusiveArch: i686 x86_64 - mcrouter ExclusiveArch: x86_64 aarch64 ppc64le - mecab-java ExclusiveArch: %java_arches - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - memtailor ExcludeArch: %{ix86} - memtest86+ ExclusiveArch: x86_64 %{ix86} - merkuro ExclusiveArch: %{qt6_qtwebengine_arches} - meshlab ExclusiveArch: aarch64 x86_64 ExcludeArch: %{ix86} - metamath ExcludeArch: %{ix86} - mfem ExcludeArch: %{ix86} - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} x86_64 riscv64 - miglayout ExclusiveArch: %{java_arches} noarch - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-libidn2 ExclusiveArch: %{ix86} x86_64 %{arm} - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - miopen ExclusiveArch: x86_64 - mirrormanager2 ExcludeArch: %{ix86} - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mlir17 ExcludeArch: i686 - mlpack ExcludeArch: %{ix86} ExcludeArch: s390 - mlton ExcludeArch: %{ix86} - mmapper ExcludeArch: %{ix86} - mmsd-tng ExcludeArch: %{ix86} - mmtests ExcludeArch: s390x - mockito ExclusiveArch: %{java_arches} noarch - mod_gnutls ExcludeArch: %{ix86} %{arm} - mod_mapcache ExcludeArch: i686 - mod_mono ExclusiveArch: %mono_arches - mod_proxy_cluster ExcludeArch: i686 i386 - modello ExclusiveArch: %{java_arches} noarch - moditect ExclusiveArch: %{java_arches} noarch - modulemaker-maven-plugin ExclusiveArch: %{java_arches} noarch - mojo-executor ExclusiveArch: %{java_arches} noarch - mojo-parent ExclusiveArch: %{java_arches} noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 %{arm} - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches ExcludeArch: armv7hl - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monodevelop ExclusiveArch: %mono_arches ExcludeArch: armv7hl - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} ExcludeArch: armv7hl - moose ExcludeArch: s390x - morphio ExcludeArch: %{ix86} - mozc ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x - mozilla-ublock-origin ExcludeArch: ppc64 s390x - mp ExcludeArch: %{ix86} - mpark-patterns ExcludeArch: %{ix86} - mpc-qt ExcludeArch: %{ix86} - mpi4py ExcludeArch: %{ix86} - mpibash ExcludeArch: %{ix86} - mpsolve ExcludeArch: %{ix86} - mrchem ExcludeArch: s390x ExcludeArch: ppc64le - mrcpp ExcludeArch: ppc64le ExcludeArch: s390x - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - msolve ExcludeArch: %{ix86} - msr-tools ExclusiveArch: %{ix86} x86_64 - mstflint ExcludeArch: s390 s390x %{arm} - msv ExclusiveArch: %{java_arches} noarch - mt32emu ExcludeArch: %{ix86} - mtxclient ExcludeArch: %{ix86} - muffin ExcludeArch: %{ix86} - mumble ExcludeArch: %{ix86} - mupen64plus ExcludeArch: s390x - musescore ExcludeArch: %{ix86} - musl ExcludeArch: s390 - mvfst ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - mxparser ExclusiveArch: %{java_arches} noarch - mysql-connector-java ExclusiveArch: %{java_arches} noarch - mysql-connector-net ExclusiveArch: %{mono_arches} - naev ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ExcludeArch: %{ix86} - nagios-plugins-check-updates ExcludeArch: %{ix86} - nant ExclusiveArch: %mono_arches ExcludeArch: armv7hl - nativejit ExclusiveArch: x86_64 - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExcludeArch: i686 - ncdu ExclusiveArch: %{zig_arches} - ncid ExcludeArch: %{ix86} - ncl ExcludeArch: %{ix86} - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - nekohtml ExclusiveArch: %{java_arches} noarch - nemo ExcludeArch: %{ix86} - nemo-extensions ExcludeArch: %{ix86} - neon2sse ExclusiveArch: x86_64 - nest ExcludeArch: %{ix86} - netatalk ExcludeArch: %{ix86} - netavark ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - netcdf-fortran ExcludeArch: %{ix86} - netdata ExcludeArch: s390x - netgen-mesher ExcludeArch: %{ix86} - neuron ExcludeArch: mips64r2 mips32r2 ExcludeArch: %{ix86} - newtonsoft-json ExclusiveArch: %{mono_arches} ExcludeArch: armv7hl - nextcloud-client ExcludeArch: %{ix86} ExcludeArch: ppc64 ppc64le s390x - nheko ExcludeArch: %{ix86} - nnpack ExclusiveArch: x86_64 - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aw-webui ExclusiveArch: %{nodejs_arches} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-language-server ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjs-module-lexer ExclusiveArch: %{lua: - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nodemon ExclusiveArch: %{nodejs_arches} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-undici ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le riscv64 noarch - nodejs18 ExclusiveArch: %{nodejs_arches} - nodejs20 ExclusiveArch: %{nodejs_arches} - nodejs22 ExclusiveArch: %{nodejs_arches} - nom-tam-fits ExclusiveArch: %{java_arches} noarch - normaliz ExcludeArch: %{ix86} - not-ocamlfind ExcludeArch: %{ix86} - notejot ExcludeArch: %{ix86} - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - ntfs2btrfs ExcludeArch: ppc64 s390x - nuget ExclusiveArch: %{mono_arches} - numactl ExcludeArch: s390 %{arm} - numatop ExclusiveArch: x86_64 ppc64le - numptyphysics ExcludeArch: ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} ExcludeArch: armv7hl - nut ExcludeArch: s390 s390x - nvml ExclusiveArch: x86_64 ppc64le - nwchem ExcludeArch: %{ix86} s390x ExcludeArch: s390x - nx-libs ExcludeArch: %{ix86} - objectweb-asm ExclusiveArch: %{java_arches} noarch - objenesis ExclusiveArch: %{java_arches} noarch - obs-service-rust2rpm ExclusiveArch: %{rust_arches} noarch - obs-studio-plugin-vkcapture ExcludeArch: s390x - ocaml ExcludeArch: %{ix86} - ocaml-SDL ExcludeArch: %{ix86} - ocaml-alcotest ExcludeArch: %{ix86} - ocaml-astring ExcludeArch: %{ix86} - ocaml-atd ExcludeArch: %{ix86} - ocaml-augeas ExcludeArch: %{ix86} - ocaml-autoconf ExcludeArch: %{ix86} - ocaml-base ExcludeArch: %{ix86} - ocaml-base64 ExcludeArch: %{ix86} - ocaml-benchmark ExcludeArch: %{ix86} - ocaml-bin-prot ExcludeArch: %{ix86} - ocaml-biniou ExcludeArch: %{ix86} - ocaml-bisect-ppx ExcludeArch: %{ix86} - ocaml-bos ExcludeArch: %{ix86} - ocaml-cairo ExcludeArch: %{ix86} - ocaml-calendar ExcludeArch: %{ix86} - ocaml-camlbz2 ExcludeArch: %{ix86} - ocaml-camlidl ExcludeArch: %{ix86} - ocaml-camlimages ExcludeArch: %{ix86} - ocaml-camlp-streams ExcludeArch: %{ix86} - ocaml-camlp5 ExcludeArch: %{ix86} - ocaml-camlp5-buildscripts ExcludeArch: %{ix86} - ocaml-camomile ExcludeArch: %{ix86} - ocaml-cinaps ExcludeArch: %{ix86} - ocaml-cmdliner ExcludeArch: %{ix86} - ocaml-compiler-libs-janestreet ExcludeArch: %{ix86} - ocaml-cppo ExcludeArch: %{ix86} - ocaml-crunch ExcludeArch: %{ix86} - ocaml-cryptokit ExcludeArch: %{ix86} - ocaml-csexp ExcludeArch: %{ix86} - ocaml-csv ExcludeArch: %{ix86} - ocaml-ctypes ExcludeArch: %{ix86} - ocaml-cudf ExcludeArch: %{ix86} - ocaml-curl ExcludeArch: %{ix86} - ocaml-curses ExcludeArch: %{ix86} - ocaml-dbus ExcludeArch: %{ix86} - ocaml-dose3 ExcludeArch: %{ix86} - ocaml-dune ExcludeArch: %{ix86} - ocaml-easy-format ExcludeArch: %{ix86} - ocaml-expat ExcludeArch: %{ix86} - ocaml-extlib ExcludeArch: %{ix86} - ocaml-facile ExcludeArch: %{ix86} - ocaml-fieldslib ExcludeArch: %{ix86} - ocaml-fileutils ExcludeArch: %{ix86} - ocaml-findlib ExcludeArch: %{ix86} - ocaml-fmt ExcludeArch: %{ix86} - ocaml-fpath ExcludeArch: %{ix86} - ocaml-gen ExcludeArch: %{ix86} - ocaml-gettext ExcludeArch: %{ix86} - ocaml-graphics ExcludeArch: %{ix86} - ocaml-gsl ExcludeArch: %{arm} %{ix86} - ocaml-integers ExcludeArch: %{ix86} - ocaml-intrinsics-kernel ExcludeArch: %{ix86} - ocaml-jane-street-headers ExcludeArch: %{ix86} - ocaml-jsonm ExcludeArch: %{ix86} - ocaml-jst-config ExcludeArch: %{ix86} - ocaml-lablgl ExcludeArch: %{ix86} - ocaml-lablgtk ExcludeArch: %{ix86} - ocaml-lablgtk3 ExcludeArch: %{ix86} - ocaml-labltk ExcludeArch: %{ix86} - ocaml-lacaml ExcludeArch: %{ix86} - ocaml-lambda-term ExcludeArch: %{ix86} - ocaml-libvirt ExcludeArch: %{ix86} - ocaml-logs ExcludeArch: %{ix86} - ocaml-luv ExcludeArch: %{ix86} - ocaml-lwt ExcludeArch: %{ix86} - ocaml-markup ExcludeArch: %{ix86} - ocaml-mccs ExcludeArch: %{ix86} - ocaml-mdx ExcludeArch: %{ix86} - ocaml-menhir ExcludeArch: %{ix86} - ocaml-merlin ExcludeArch: %{ix86} - ocaml-mew ExcludeArch: %{ix86} - ocaml-mew-vi ExcludeArch: %{ix86} - ocaml-mlgmpidl ExcludeArch: %{ix86} - ocaml-mlmpfr ExcludeArch: %{ix86} - ocaml-mtime ExcludeArch: %{ix86} - ocaml-mysql ExcludeArch: %{ix86} - ocaml-num ExcludeArch: %{ix86} - ocaml-obuild ExcludeArch: %{ix86} - ocaml-ocamlbuild ExcludeArch: %{ix86} - ocaml-ocamlgraph ExcludeArch: %{ix86} - ocaml-ocamlnet ExcludeArch: %{ix86} - ocaml-ocp-indent ExcludeArch: %{ix86} - ocaml-ocplib-endian ExcludeArch: %{ix86} - ocaml-ocplib-simplex ExcludeArch: %{ix86} - ocaml-octavius ExcludeArch: %{ix86} - ocaml-odoc ExcludeArch: %{ix86} - ocaml-omake ExcludeArch: %{ix86} - ocaml-opam-0install-cudf ExcludeArch: %{ix86} - ocaml-opam-file-format ExcludeArch: %{ix86} - ocaml-ounit ExcludeArch: %{ix86} - ocaml-parmap ExcludeArch: %{ix86} - ocaml-parsexp ExcludeArch: %{ix86} - ocaml-pcre ExcludeArch: %{ix86} - ocaml-pcre2 ExcludeArch: %{ix86} - ocaml-perl4caml ExcludeArch: %{ix86} - ocaml-postgresql ExcludeArch: %{ix86} - ocaml-pp ExcludeArch: %{ix86} - ocaml-ppx-assert ExcludeArch: %{ix86} - ocaml-ppx-base ExcludeArch: %{ix86} - ocaml-ppx-cold ExcludeArch: %{ix86} - ocaml-ppx-compare ExcludeArch: %{ix86} - ocaml-ppx-custom-printf ExcludeArch: %{ix86} - ocaml-ppx-derivers ExcludeArch: %{ix86} - ocaml-ppx-deriving ExcludeArch: %{ix86} - ocaml-ppx-deriving-yaml ExcludeArch: %{ix86} - ocaml-ppx-deriving-yojson ExcludeArch: %{ix86} - ocaml-ppx-enumerate ExcludeArch: %{ix86} - ocaml-ppx-expect ExcludeArch: %{ix86} - ocaml-ppx-fields-conv ExcludeArch: %{ix86} - ocaml-ppx-globalize ExcludeArch: %{ix86} - ocaml-ppx-hash ExcludeArch: %{ix86} - ocaml-ppx-here ExcludeArch: %{ix86} - ocaml-ppx-inline-test ExcludeArch: %{ix86} - ocaml-ppx-js-style ExcludeArch: %{ix86} - ocaml-ppx-let ExcludeArch: %{ix86} - ocaml-ppx-optcomp ExcludeArch: %{ix86} - ocaml-ppx-sexp-conv ExcludeArch: %{ix86} - ocaml-ppx-stable-witness ExcludeArch: %{ix86} - ocaml-ppx-variants-conv ExcludeArch: %{ix86} - ocaml-ppxlib ExcludeArch: %{ix86} - ocaml-ppxlib-jane ExcludeArch: %{ix86} - ocaml-psmt2-frontend ExcludeArch: %{ix86} - ocaml-ptime ExcludeArch: %{ix86} - ocaml-ptmap ExcludeArch: %{ix86} - ocaml-pyml ExcludeArch: %{ix86} - ocaml-qcheck ExcludeArch: %{ix86} - ocaml-qtest ExcludeArch: %{ix86} - ocaml-re ExcludeArch: %{ix86} - ocaml-react ExcludeArch: %{ix86} - ocaml-res ExcludeArch: %{ix86} - ocaml-result ExcludeArch: %{ix86} - ocaml-rresult ExcludeArch: %{ix86} - ocaml-sedlex ExcludeArch: %{ix86} - ocaml-sexplib ExcludeArch: %{ix86} - ocaml-sexplib0 ExcludeArch: %{ix86} - ocaml-sha ExcludeArch: %{ix86} - ocaml-spdx-licenses ExcludeArch: %{ix86} - ocaml-sqlite ExcludeArch: %{ix86} - ocaml-ssl ExcludeArch: %{ix86} - ocaml-stdcompat ExcludeArch: %{ix86} - ocaml-stdio ExcludeArch: %{ix86} - ocaml-stdlib-random ExcludeArch: %{ix86} - ocaml-swhid-core ExcludeArch: %{ix86} - ocaml-time-now ExcludeArch: %{ix86} - ocaml-topkg ExcludeArch: %{ix86} - ocaml-trie ExcludeArch: %{ix86} - ocaml-tyxml ExcludeArch: %{ix86} - ocaml-unionfind ExcludeArch: %{ix86} - ocaml-uucd ExcludeArch: %{ix86} - ocaml-uucp ExcludeArch: %{ix86} - ocaml-uunf ExcludeArch: %{ix86} - ocaml-uuseg ExcludeArch: %{ix86} - ocaml-uutf ExcludeArch: %{ix86} - ocaml-variantslib ExcludeArch: %{ix86} - ocaml-version ExcludeArch: %{ix86} - ocaml-xml-light ExcludeArch: %{ix86} - ocaml-xmlm ExcludeArch: %{ix86} - ocaml-xmlrpc-light ExcludeArch: %{ix86} - ocaml-yaml ExcludeArch: %{ix86} - ocaml-yojson ExcludeArch: %{ix86} - ocaml-zarith ExcludeArch: %{ix86} - ocaml-zed ExcludeArch: %{ix86} - ocaml-zip ExcludeArch: %{ix86} - ocaml-zmq ExcludeArch: %{ix86} - ocamlify ExcludeArch: %{ix86} - ocamlmod ExcludeArch: %{ix86} - oci-seccomp-bpf-hook ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl ExclusiveArch: %{golang_arches_future} - ocrmypdf ExcludeArch: %{ix86} - octave-communications ExcludeArch: s390x - octave-iso2mesh ExcludeArch: armv7hl - octave-signal ExcludeArch: s390x - oidc-agent ExcludeArch: %{ix86} - oidn ExclusiveArch: x86_64 - olive ExcludeArch: i686 - ollama ExcludeArch: ppc64le s390x aarch64 - oneapi-level-zero ExclusiveArch: x86_64 - onednn ExclusiveArch: x86_64 aarch64 ppc64le s390x - onedrive ExclusiveArch: %{ldc_arches} - ongres-scram ExclusiveArch: %{java_arches} noarch - ongres-stringprep ExclusiveArch: %{java_arches} noarch - onnx ExcludeArch: s390x ExcludeArch: %{ix86} - onnxruntime ExcludeArch: s390x %{arm} %{ix86} - oomd ExcludeArch: i686 armv7hl - opae ExclusiveArch: x86_64 - opal-prd ExclusiveArch: ppc64le - opam ExcludeArch: %{ix86} - open-vm-tools ExclusiveArch: x86_64 aarch64 ExclusiveArch: %{ix86} x86_64 aarch64 ExclusiveArch: x86_64 - openblas ExclusiveArch: %{openblas_arches} - opencsg ExcludeArch: %{ix86} - opengrm-ngram ExcludeArch: %{ix86} - openjdk-asmtools ExclusiveArch: %{java_arches} noarch - openjdk-asmtools7 ExclusiveArch: %{java_arches} noarch - openjfx ExclusiveArch: %{java_arches} - openjph ExcludeArch: %{ix86} - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openmeeg ExcludeArch: s390x - openmpi ExcludeArch: %{ix86} - openms ExclusiveArch: %{qt6_qtwebengine_arches} - openni ExclusiveArch: x86_64 %{arm} - openni-primesense ExclusiveArch: x86_64 %{arm} - openobex ExcludeArch: s390 s390x - openoffice.org-diafilter ExclusiveArch: %{java_arches} - openpgl ExclusiveArch: aarch64 x86_64 - openrgb ExcludeArch: %{ix86} - openscad ExcludeArch: %{ix86} - openshadinglanguage ExcludeArch: %{ix86} %{arm} - openshot ExcludeArch: ppc64le - opensm ExcludeArch: s390 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - opentest4j ExclusiveArch: %{java_arches} noarch - opentype-sanitizer ExcludeArch: %{ix86} - openvdb ExcludeArch: %{ix86} - openvino ExclusiveArch: x86_64 - openvkl ExclusiveArch: aarch64 x86_64 - openxr-simple-playground ExcludeArch: %{ix86} - optee_client ExclusiveArch: aarch64 - optee_os ExclusiveArch: aarch64 - options ExclusiveArch: %{java_arches} noarch - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - os-autoinst ExcludeArch: %{ix86} ExcludeArch: %{arm} - osbuild-composer ExcludeArch: i686 armv7hl - osgi-annotation ExclusiveArch: %{java_arches} noarch - osgi-compendium ExclusiveArch: %{java_arches} noarch - osgi-core ExclusiveArch: %{java_arches} noarch - osm2pgsql ExcludeArch: %{ix86} - osslsigncode ExcludeArch: i686 - ostree ExcludeArch: %{ix86} - osu-micro-benchmarks ExcludeArch: %{ix86} - otf2 ExcludeArch: i686 s390x - oz ExcludeArch: %{ix86} - pageedit ExclusiveArch: %{qt5_qtwebengine_arches} - papers ExcludeArch: %{ix86} - paperwork ExcludeArch: %{ix86} - papi ExcludeArch: s390 s390x - papilo ExcludeArch: %{ix86} - paraview ExcludeArch: %{ix86} - pari-nftables ExcludeArch: %{ix86} - parlaylib ExcludeArch: aarch64 s390x arm-hfp ppc64le i686 - parserng ExclusiveArch: %{java_arches} noarch - pasdoc ExclusiveArch: %{fpc_arches} - pcem ExcludeArch: armv7hl i686 ppc64le s390x - pcfi ExclusiveArch: %{java_arches} noarch - pcg-cpp ExcludeArch: %{ix86} - pcm ExclusiveArch: %{ix86} x86_64 - pcp ExcludeArch: %{ix86} - pcp2pdf ExcludeArch: %{ix86} - pdbg ExclusiveArch: ppc64le - pdfarranger ExcludeArch: %{ix86} - pdfbox ExclusiveArch: %{java_arches} noarch - pdftk-java ExclusiveArch: %{java_arches} noarch - pdns ExcludeArch: %{arm} %{ix86} - pdns-recursor ExcludeArch: %{arm} %{ix86} - pdqsort ExcludeArch: %{ix86} - pengupop ExcludeArch: s390x - pentaho-libxml ExclusiveArch: %{java_arches} noarch - pentaho-reporting-flow-engine ExclusiveArch: %{java_arches} noarch - percetto ExclusiveArch: aarch64 x86_64 - perfetto ExclusiveArch: aarch64 x86_64 - perftest ExcludeArch: s390 %{arm} - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-EV-Glib ExcludeArch: %{ix86} - perl-LMDB_File ExcludeArch: armv7hl i686 - perl-Math-Int128 ExcludeArch: %{arm32} %{ix86} - perl-MaxMind-DB-Reader-XS ExcludeArch: %{arm} %{ix86} - perl-MongoDB ExcludeArch: ppc %{sparc} s390 - perl-Net-Works ExcludeArch: %{arm32} %{ix86} - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - perl-Task-Catalyst ExcludeArch: %{ix86} - perl-re-engine-RE2 ExcludeArch: %{ix86} - perl-threads-lite ExcludeArch: aarch64 ppc ppc64 ppc64le - permlib ExcludeArch: %{ix86} - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} riscv64 - petpvc ExcludeArch: %{ix86} - pf-bb-config ExcludeArch: s390x - pgadmin4 ExcludeArch: i686 armv7hl s390x ppc64le - phd2 ExcludeArch: %{ix86} - phoc ExcludeArch: i686 - phosh ExcludeArch: i686 - phosh-mobile-settings ExcludeArch: i686 - php ExcludeArch: %{ix86} - php-ast ExcludeArch: %{ix86} - php-facedetect ExcludeArch: %{ix86} - php-geos ExcludeArch: %{ix86} - php-libvirt ExcludeArch: %{ix86} - php-maxminddb ExcludeArch: %{ix86} - php-pecl-amqp ExcludeArch: %{ix86} - php-pecl-apcu ExcludeArch: %{ix86} - php-pecl-apfd ExcludeArch: %{ix86} - php-pecl-dio ExcludeArch: %{ix86} - php-pecl-ds ExcludeArch: %{ix86} - php-pecl-event ExcludeArch: %{ix86} - php-pecl-fann ExcludeArch: %{ix86} - php-pecl-geoip ExcludeArch: %{ix86} - php-pecl-gmagick ExcludeArch: %{ix86} - php-pecl-http ExcludeArch: %{ix86} - php-pecl-igbinary ExcludeArch: %{ix86} - php-pecl-imagick ExcludeArch: %{ix86} - php-pecl-inotify ExcludeArch: %{ix86} - php-pecl-ip2location ExcludeArch: %{ix86} - php-pecl-json-post ExcludeArch: %{ix86} - php-pecl-krb5 ExcludeArch: %{ix86} - php-pecl-lzf ExcludeArch: %{ix86} - php-pecl-mailparse ExcludeArch: %{ix86} - php-pecl-mcrypt ExcludeArch: %{ix86} - php-pecl-memcache ExcludeArch: %{ix86} - php-pecl-memcached ExcludeArch: %{ix86} - php-pecl-mongodb ExcludeArch: %{ix86} - php-pecl-msgpack ExcludeArch: %{ix86} - php-pecl-oauth ExcludeArch: %{ix86} - php-pecl-pcov ExcludeArch: %{ix86} - php-pecl-pq ExcludeArch: %{ix86} - php-pecl-raphf ExcludeArch: %{ix86} - php-pecl-redis6 ExcludeArch: %{ix86} - php-pecl-rpminfo ExcludeArch: %{ix86} - php-pecl-rrd ExcludeArch: %{ix86} - php-pecl-selinux ExcludeArch: %{ix86} - php-pecl-ssdeep ExcludeArch: %{ix86} - php-pecl-ssh2 ExcludeArch: %{ix86} - php-pecl-uuid ExcludeArch: %{ix86} - php-pecl-var-representation ExcludeArch: %{ix86} - php-pecl-xattr ExcludeArch: %{ix86} - php-pecl-xdebug3 ExcludeArch: %{ix86} - php-pecl-xmldiff ExcludeArch: %{ix86} - php-pecl-xmlrpc ExcludeArch: %{ix86} - php-pecl-xpass ExcludeArch: %{ix86} - php-pecl-yac ExcludeArch: %{ix86} - php-pecl-yaml ExcludeArch: %{ix86} - php-pecl-zip ExcludeArch: %{ix86} - php-phpiredis ExcludeArch: %{ix86} - php-smbclient ExcludeArch: %{ix86} - php-zmq ExcludeArch: %{ix86} - php-zstd ExcludeArch: %{ix86} - picard ExcludeArch: ppc64 - picocli ExclusiveArch: %{java_arches} noarch - picom ExcludeArch: %{ix86} - pigeonascent ExcludeArch: ppc64le ExcludeArch: s390x - pilot-link ExcludeArch: s390 s390x - pinta ExclusiveArch: %mono_arches ExcludeArch: armv7hl - pioneer ExclusiveArch: %{ix86} x86_64 - pl ExcludeArch: %{ix86} - planets ExcludeArch: %{ix86} - plantri ExcludeArch: %{ix86} - plantuml ExclusiveArch: %{java_arches} noarch - plasma-dialer ExclusiveArch: %{java_arches} - plasma-discover ExcludeArch: %{ix86} - plasma-disks ExcludeArch: %{ix86} - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - plee-the-bear ExcludeArch: %{power64} - plexus-archiver ExclusiveArch: %{java_arches} noarch - plexus-build-api ExclusiveArch: %{java_arches} noarch - plexus-build-api0 ExclusiveArch: %{java_arches} noarch - plexus-cipher ExclusiveArch: %{java_arches} noarch - plexus-classworlds ExclusiveArch: %{java_arches} noarch - plexus-compiler ExclusiveArch: %{java_arches} noarch - plexus-component-api ExclusiveArch: %{java_arches} noarch - plexus-components-pom ExclusiveArch: %{java_arches} noarch - plexus-containers ExclusiveArch: %{java_arches} noarch - plexus-i18n ExclusiveArch: %{java_arches} noarch - plexus-interpolation ExclusiveArch: %{java_arches} noarch - plexus-io ExclusiveArch: %{java_arches} noarch - plexus-languages ExclusiveArch: %{java_arches} noarch - plexus-pom ExclusiveArch: %{java_arches} noarch - plexus-resources ExclusiveArch: %{java_arches} noarch - plexus-sec-dispatcher ExclusiveArch: %{java_arches} noarch - plexus-testing ExclusiveArch: %{java_arches} noarch - plexus-utils ExclusiveArch: %{java_arches} noarch - plexus-velocity ExclusiveArch: %{java_arches} noarch - plexus-xml ExclusiveArch: %{java_arches} noarch - pmbootstrap ExclusiveArch: %x86_64 %arm64 armv6l armv7l armv8l noarch - pmix ExcludeArch: %{ix86} - pngcheck ExcludeArch: %{ix86} - pocl ExcludeArch: %{ix86} - podman ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 ExclusiveArch: x86_64 aarch64 - polymake ExcludeArch: %{ix86} - polyml ExcludeArch: %{ix86} - pop-launcher ExcludeArch: %{ix86} - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - postgresql-jdbc ExclusiveArch: %{java_arches} noarch - postgresql-pgpool-II ExcludeArch: %{ix86} ExcludeArch: %{ix86} ExcludeArch: %{ix86} - powerpc-utils ExclusiveArch: ppc %{power64} - powerstat ExclusiveArch: %{ix86} x86_64 - ppc64-diag ExclusiveArch: ppc %{power64} - ppl ExcludeArch: %{ix86} - pplite ExcludeArch: %{ix86} - prestopalette ExcludeArch: i686 - printer-driver-brlaser ExcludeArch: %{ix86} - procdump ExclusiveArch: x86_64 ppc64le s390x - procyon ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch - prooftree ExcludeArch: %{ix86} - proxmark3 ExcludeArch: ppc64le s390x i686 - proxygen ExclusiveArch: x86_64 aarch64 ppc64le - proxysql ExcludeArch: %{power64} s390x %{ix86} - prrte ExcludeArch: %{ix86} - prusa-slicer ExcludeArch: %{ix86} - psblas3 ExcludeArch: %{ix86} - psi4 ExcludeArch: %{ix86} - ptyxis ExcludeArch: %{ix86} - pveclib ExclusiveArch: ppc %{power64} - pygrib ExcludeArch: i686 ExcludeArch: armv7hl - pygsl ExcludeArch: %{ix86} - pyosmium ExcludeArch: %{ix86} - pypy ExcludeArch: %{ix86} - pypy3.10 ExcludeArch: %{ix86} - pypy3.9 ExcludeArch: %{ix86} - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-aiokafka ExcludeArch: %{ix86} - python-aioresponses ExcludeArch: s390x - python-annarchy ExcludeArch: %{ix86} ppc64le - python-asn1tools ExcludeArch: s390x - python-ast-monitor ExclusiveArch: %{qt6_qtwebengine_arches} noarch - python-astroplan ExcludeArch: %{ix86} - python-astropy ExcludeArch: %{ix86} - python-astropy-healpix ExcludeArch: %{ix86} - python-astroscrappy ExcludeArch: %{ix86} - python-asyncmy ExcludeArch: %{ix86} - python-aws-sam-translator ExcludeArch: %{ix86} - python-awscrt ExcludeArch: s390x - python-bitstruct ExcludeArch: s390x - python-blosc2 ExcludeArch: %{ix86} - python-bluepyopt ExcludeArch: s390x %{ix86} %{power64} - python-brian2 ExcludeArch: %{ix86} - python-calcephpy ExcludeArch: %{ix86} - python-cascadio ExcludeArch: %{ix86} s390x - python-colorthief ExcludeArch: %{ix86} - python-compreffor ExcludeArch: %{ix86} - python-contextualbandits ExcludeArch: %{ix86} - python-cradox ExcludeArch: i686 armv7hl - python-cramjam ExcludeArch: %{ix86} - python-crick ExcludeArch: %{ix86} - python-cryptography ExclusiveArch: %{rust_arches} - python-cvxopt ExcludeArch: %{ix86} - python-cyipopt ExcludeArch: %{ix86} - python-damo ExcludeArch: %{ix86} - python-dask ExcludeArch: %{ix86} - python-databases ExcludeArch: %{ix86} - python-detect-secrets ExclusiveArch: x86_64 %{arm64} ppc64le riscv64 noarch - python-dijitso ExcludeArch: i686 - python-dipy ExcludeArch: %{ix86} - python-distributed ExcludeArch: %{ix86} - python-ducc0 ExcludeArch: %{ix86} - python-earthpy ExcludeArch: %{ix86} - python-eccodes ExcludeArch: i686 ExcludeArch: armv7hl - python-efel ExcludeArch: s390x - python-einops ExclusiveArch: x86_64 aarch64 - python-elephant ExcludeArch: s390x ExcludeArch: %{ix86} - python-ephyviewer ExcludeArch: s390x %{ix86} - python-ezdxf ExcludeArch: %{ix86} - python-fast-simplification ExcludeArch: %{ix86} - python-fastavro ExcludeArch: %{arm32} %{ix86} - python-folium ExcludeArch: %{ix86} - python-formulaic ExcludeArch: %{ix86} - python-fsleyes ExcludeArch: %{ix86} - python-fsleyes-props ExcludeArch: %{ix86} - python-fslpy ExcludeArch: %{ix86} - python-gbinder ExcludeArch: %{ix86} - python-giacpy ExcludeArch: aarch64 %{power64} s390x - python-glymur ExcludeArch: %{ix86} - python-graph-tool ExcludeArch: %{ix86} - python-hdfs ExcludeArch: %{ix86} - python-healpy ExcludeArch: %{ix86} %{arm} - python-heapdict ExcludeArch: %{ix86} - python-imagecodecs ExcludeArch: %{ix86} - python-img2pdf ExcludeArch: s390x - python-janus-swi ExcludeArch: %{ix86} - python-javaobj ExclusiveArch: %{java_arches} noarch - python-jnius ExclusiveArch: %{java_arches} ExclusiveArch: %{java_arches} - python-json-minify ExcludeArch: %{ix86} - python-jupymake ExcludeArch: %{ix86} - python-jupyter-c-kernel ExcludeArch: %{ix86} - python-jupyter-kernel-singular ExcludeArch: %{ix86} - python-jupyter-polymake ExcludeArch: %{ix86} - python-jupytext ExcludeArch: s390x - python-lazy-ops ExcludeArch: %{ix86} - python-lfpy ExcludeArch: mips64r2 mips32r2 ExcludeArch: %{power64} %{ix86} armv7hl - python-lion-pytorch ExclusiveArch: x86_64 aarch64 - python-llama-cpp-python ExclusiveArch: x86_64 aarch64 - python-logdetective ExclusiveArch: x86_64 aarch64 - python-mapnik ExcludeArch: ppc ppc64 s390 s390x - python-meshio ExcludeArch: %{ix86} - python-missingno ExcludeArch: %{ix86} - python-mne ExcludeArch: %{ix86} - python-mne-bids ExcludeArch: %{ix86} - python-mplcairo ExcludeArch: %{ix86} - python-mplcursors ExcludeArch: %{ix86} - python-msgspec ExcludeArch: s390x i686 - python-music21 ExcludeArch: %{ix86} - python-nbdime ExclusiveArch: x86_64 aarch64 - python-ndindex ExcludeArch: %{ix86} - python-neatdend ExcludeArch: %{ix86} - python-neo ExcludeArch: s390x - python-netpyne ExcludeArch: %{ix86} - python-neurom ExcludeArch: %{ix86} - python-neurotune ExcludeArch: %{ix86} - python-nifti-mrs ExcludeArch: %{ix86} - python-nilearn ExcludeArch: %{ix86} - python-nipy ExcludeArch: %{ix86} - python-nitime ExcludeArch: %{ix86} - python-numcodecs ExcludeArch: %{ix86} - python-numpoly ExcludeArch: %{ix86} - python-octave-kernel ExcludeArch: %{ix86} - python-openpaperwork-core ExcludeArch: %{ix86} - python-openpaperwork-gtk ExcludeArch: %{ix86} - python-pandas ExcludeArch: %{ix86} - python-pandas-flavor ExcludeArch: %{ix86} - python-papermill ExcludeArch: %{ix86} - python-paperwork-backend ExcludeArch: %{ix86} - python-pari-jupyter ExcludeArch: %{ix86} - python-photutils ExcludeArch: %{ix86} - python-phyghtmap ExcludeArch: %{ix86} - python-pingouin ExcludeArch: %{ix86} - python-psycopg3 ExcludeArch: %{ix86} - python-pulp ExcludeArch: %{ix86} - python-pyahocorasick ExclusiveArch: x86_64 %{arm64} ppc64le riscv64 - python-pybbi ExcludeArch: %{ix86} - python-pybids ExcludeArch: %{ix86} - python-pybv ExcludeArch: %{ix86} - python-pydicom ExcludeArch: %{ix86} - python-pyedflib ExcludeArch: s390x - python-pyfiglet ExcludeArch: %{ix86} - python-pykdtree ExcludeArch: %{ix86} - python-pyliblzfse ExcludeArch: s390x - python-pymapvbvd ExcludeArch: s390x - python-pymatreader ExcludeArch: %{ix86} ExcludeArch: s390x - python-pynn ExcludeArch: mips64r2 mips32r2 s390x %{ix86} - python-pyocr ExcludeArch: %{ix86} - python-pyogrio ExcludeArch: %{ix86} - python-pypet ExcludeArch: %{ix86} s390x - python-pyphi ExcludeArch: %{ix86} s390x - python-pypillowfight ExcludeArch: %{ix86} - python-pyqt6-webengine ExclusiveArch: %{qt6_qtwebengine_arches} - python-pyriemann ExcludeArch: %{ix86} - python-pyroaring ExcludeArch: %{ix86} - python-pyscf ExcludeArch: %{power64} - python-pyshtools ExcludeArch: %{ix86} - python-pysingular ExcludeArch: %{ix86} - python-pyswip ExcludeArch: %{ix86} - python-pytest-arraydiff ExcludeArch: %{ix86} - python-pytest-tornado ExcludeArch: %{ix86} - python-python-fcl ExcludeArch: %{ix86} - python-pyunicorn ExcludeArch: %{ix86} - python-pyvat ExcludeArch: %{ix86} - python-ratinabox ExcludeArch: %{ix86} - python-recordclass ExcludeArch: %{ix86} - python-reproject ExcludeArch: %{ix86} - python-scikit-image ExcludeArch: %{ix86} - python-scikit-learn ExcludeArch: %{ix86} - python-scikit-misc ExcludeArch: %{ix86} - python-sgp4 ExcludeArch: %{ix86} - python-simplebayes ExcludeArch: %{ix86} - python-statsmodels ExcludeArch: %{ix86} - python-steps ExcludeArch: %{ix86} - python-symengine ExcludeArch: %{ix86} - python-tables ExcludeArch: %{ix86} - python-tensile ExclusiveArch: x86_64 - python-tkrzw ExcludeArch: i686 - python-torch ExclusiveArch: x86_64 aarch64 - python-torchaudio ExclusiveArch: x86_64 aarch64 - python-torchdata ExclusiveArch: x86_64 aarch64 - python-torchdiffeq ExclusiveArch: x86_64 aarch64 - python-torchsde ExclusiveArch: x86_64 aarch64 - python-torchtext ExclusiveArch: x86_64 aarch64 - python-torchvision ExclusiveArch: x86_64 aarch64 - python-traitsui ExcludeArch: ppc64le - python-trimesh ExcludeArch: %{ix86} - python-triton ExclusiveArch: x86_64 - python-uranium ExcludeArch: %{ix86} - python-willow ExcludeArch: %{ix86} - python-xattr ExcludeArch: %{ix86} - python-xbout ExcludeArch: %{ix86} - python-xmp-toolkit ExcludeArch: %{ix86} - python-zeep ExcludeArch: s390x - python-zict ExcludeArch: %{ix86} - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qalculate-qt ExcludeArch: %{ix86} - qat-zstd-plugin ExclusiveArch: x86_64 - qatengine ExclusiveArch: x86_64 - qatlib ExcludeArch: %{arm} aarch64 %{power64} s390x i686 - qatzip ExclusiveArch: x86_64 - qbe ExclusiveArch: x86_64 aarch64 riscv64 - qbittorrent ExcludeArch: %{ix86} - qbs ExcludeArch: i686 - qcas ExcludeArch: aarch64 %{power64} s390x - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qdigidoc ExcludeArch: %{ix86} - qdox ExclusiveArch: %{java_arches} noarch - qemu-sanity-check ExclusiveArch: %{kernel_arches} ExcludeArch: %{power64} - qepcad-B ExcludeArch: %{ix86} - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qflipper ExcludeArch: %{ix86} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qmplay2 ExcludeArch: %{ix86} - qoauth ExcludeArch: ppc64 - qownnotes ExcludeArch: %{ix86} - qpdfview ExcludeArch: s390x - qperf ExcludeArch: %{arm} - qsopt-ex ExcludeArch: %{ix86} - qsstv ExcludeArch: i686 - qt-jdenticon ExcludeArch: %{ix86} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - qt6-qtquick3dphysics ExclusiveArch: aarch64 i686 x86_64 - qt6-qtwebengine ExclusiveArch: aarch64 x86_64 - qt6-qtwebview ExclusiveArch: aarch64 x86_64 - qt6ct ExcludeArch: s390x - qtile ExcludeArch: %{ix86} - quantum-espresso ExclusiveArch: x86_64 aarch64 %{power64} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - rEFInd ExclusiveArch: %{efi} ExcludeArch: %{arm32} - rapidyaml ExcludeArch: %{ix86} - rasdaemon ExcludeArch: s390 s390x - rawtherapee ExcludeArch: %{ix86} - rccl ExclusiveArch: x86_64 - rdma-core ExcludeArch: %{arm} - realtime-tests ExcludeArch: %{arm} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 s390x - redeclipse ExcludeArch: %{ix86} - redfish-finder ExclusiveArch: x86_64 aarch64 - redict ExcludeArch: %{ix86} - reflections ExclusiveArch: %{java_arches} noarch - reg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - regexp ExclusiveArch: %{java_arches} noarch - relaxng-datatype-java ExclusiveArch: %{java_arches} noarch - remake ExcludeArch: %{ix86} - renderdoc ExclusiveArch: x86_64 aarch64 - replacer ExclusiveArch: %{java_arches} noarch - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - rescene ExclusiveArch: %{mono_arches} - resteasy ExclusiveArch: %{java_arches} noarch - restool ExclusiveArch: aarch64 - restsharp ExclusiveArch: %{mono_arches} ExcludeArch: armv7hl - retroarch ExcludeArch: %{ix86} ExcludeArch: s390x - retsnoop ExclusiveArch: %{rust_arches} ExcludeArch: armv7hl ExcludeArch: %{ix86} - rhino ExclusiveArch: %{java_arches} noarch ExcludeArch: %{ix86} - rhythmbox ExcludeArch: s390 s390x - rhythmbox-alternative-toolbar ExcludeArch: s390 s390x - rhythmbox-ampache ExcludeArch: s390 s390x - rigsync ExcludeArch: i686 - river ExclusiveArch: %{zig_arches} - rkcommon ExclusiveArch: x86_64 aarch64 - rnp ExcludeArch: %{ix86} - rocalution ExclusiveArch: x86_64 - rocblas ExclusiveArch: x86_64 - rocclr ExclusiveArch: x86_64 - rocdecode ExclusiveArch: x86_64 - rocfft ExclusiveArch: x86_64 - rocjpeg ExclusiveArch: x86_64 - rocm-compilersupport ExclusiveArch: x86_64 ExclusiveArch: x86_64 aarch64 ppc64le - rocm-core ExclusiveArch: x86_64 - rocm-omp ExclusiveArch: x86_64 - rocm-rpm-macros ExclusiveArch: x86_64 - rocm-rpp ExclusiveArch: x86_64 - rocm-runtime ExclusiveArch: x86_64 - rocm-smi ExclusiveArch: x86_64 ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - rocminfo ExclusiveArch: x86_64 - rocprim ExclusiveArch: x86_64 - rocrand ExclusiveArch: x86_64 - rocsolver ExclusiveArch: x86_64 - rocsparse ExclusiveArch: x86_64 - rocthrust ExclusiveArch: x86_64 - roctracer ExclusiveArch: x86_64 - rogue ExcludeArch: %{ix86} - rpi-imager ExcludeArch: s390x - rpki-client ExcludeArch: %{ix86} - rpm-ostree ExcludeArch: %{ix86} - rpy ExcludeArch: %{ix86} - rr ExclusiveArch: %{ix86} x86_64 aarch64 - rssguard ExclusiveArch: %{qt6_qtwebengine_arches} - rsyntaxtextarea ExclusiveArch: %{java_arches} noarch - rubygem-childprocess ExclusiveArch: %{ix86} x86_64 noarch - rubygem-selenium-webdriver ExclusiveArch: x86_64 aarch64 - ruff ExcludeArch: %{ix86} - runc ExclusiveArch: %{golang_arches_future} - rundoc ExclusiveArch: %{java_arches} noarch - rust ExclusiveArch: %{rust_arches} - rust-afterburn ExcludeArch: %{ix86} - rust-ash ExcludeArch: %{ix86} - rust-bankstown-lv2 ExcludeArch: ppc64le s390x - rust-below ExcludeArch: %{arm32} %{ix86} - rust-below-btrfs ExcludeArch: %{arm32} %{ix86} - rust-below-config ExcludeArch: %{arm32} %{ix86} - rust-below-dump ExcludeArch: %{arm32} %{ix86} - rust-below-ethtool ExcludeArch: %{arm32} %{ix86} - rust-below-model ExcludeArch: %{arm32} %{ix86} - rust-below-render ExcludeArch: %{arm32} %{ix86} - rust-below-store ExcludeArch: %{arm32} %{ix86} - rust-below-view ExcludeArch: %{arm32} %{ix86} - rust-blazesym-c ExcludeArch: %{ix86} - rust-bootupd ExcludeArch: %{ix86} - rust-cgroupfs ExcludeArch: %{arm32} %{ix86} - rust-compress-tools ExclusiveArch: %{rust_arches} - rust-coreos-installer ExcludeArch: %{ix86} - rust-coreutils ExcludeArch: %{ix86} - rust-crypto-auditing-agent ExcludeArch: i386 i686 - rust-ctr ExclusiveArch: %{rust_arches} - rust-dashmap4 ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-deflate0.8 ExclusiveArch: %{rust_arches} - rust-getch ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-hamming ExclusiveArch: %{rust_arches} - rust-hidapi ExclusiveArch: %{rust_arches} - rust-hidpipe ExcludeArch: %{ix86} - rust-humantime-serde ExclusiveArch: %{rust_arches} - rust-isal-rs ExcludeArch: %{ix86} - rust-isal-sys ExcludeArch: %{ix86} - rust-krun-sys ExclusiveArch: x86_64 aarch64 - rust-krunvm ExclusiveArch: x86_64 aarch64 - rust-libcramjam ExcludeArch: %{ix86} - rust-libcramjam0.6 ExcludeArch: %{ix86} - rust-libphosh ExcludeArch: %{ix86} - rust-libphosh-sys ExcludeArch: %{ix86} - rust-lv2 ExcludeArch: ppc64le s390x - rust-lv2-atom ExcludeArch: ppc64le s390x - rust-lv2-core ExcludeArch: ppc64le s390x - rust-lv2-midi ExcludeArch: ppc64le s390x - rust-lv2-state ExcludeArch: ppc64le s390x - rust-lv2-sys ExcludeArch: ppc64le s390x - rust-lv2-time ExcludeArch: ppc64le s390x - rust-lv2-units ExcludeArch: ppc64le s390x - rust-lv2-urid ExcludeArch: ppc64le s390x - rust-lv2-worker ExcludeArch: ppc64le s390x - rust-msru ExclusiveArch: x86_64 - rust-muvm ExclusiveArch: x86_64 aarch64 - rust-nu ExcludeArch: %{ix86} - rust-onig ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-prefixdevname ExcludeArch: %{ix86} - rust-probe ExcludeArch: ppc64le s390x - rust-psl-types ExclusiveArch: %{rust_arches} - rust-pwd ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-resctrlfs ExcludeArch: %{arm32} %{ix86} - rust-schemafy_core ExclusiveArch: %{rust_arches} - rust-schemafy_lib ExclusiveArch: %{rust_arches} - rust-scx_layered ExcludeArch: %{ix86} - rust-scx_rustland ExcludeArch: %{ix86} - rust-scx_rusty ExcludeArch: %{ix86} - rust-scx_utils ExcludeArch: %{ix86} - rust-seahash ExclusiveArch: %{rust_arches} - rust-sequoia-octopus-librnp ExcludeArch: %{ix86} %{arm} s390x - rust-serde_yaml0.8 ExclusiveArch: %{rust_arches} - rust-sevctl ExclusiveArch: x86_64 - rust-sinit ExclusiveArch: %{rust_arches} - rust-snphost ExclusiveArch: x86_64 - rust-ssh-key-dir ExcludeArch: %{ix86} - rust-structopt ExclusiveArch: %{rust_arches} - rust-tiny-dfr ExcludeArch: %{ix86} - rust-tpm2-policy ExclusiveArch: %{rust_arches} - rust-triforce-lv2 ExcludeArch: ppc64le s390x - rust-uriparse ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-vhost ExcludeArch: %{ix86} - rust-vhost-device-scmi ExcludeArch: %{ix86} ExcludeArch: s390x - rust-vhost-device-sound ExcludeArch: %{ix86} s390x - rust-vhost-device-vsock ExcludeArch: s390x ExcludeArch: %{ix86} - rust-vhost-user-backend ExcludeArch: %{ix86} - rust-virtio-bindings ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - rust-virtio-queue ExcludeArch: i686 - rust-virtio-vsock ExcludeArch: s390x ExcludeArch: %{ix86} - rust-vm-memory ExcludeArch: %{ix86} - rust-vmm-sys-util ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - rust-web-ext-native-messaging ExclusiveArch: %{rust_arches} - rust-zincati ExcludeArch: armv7hl i686 - rustup ExcludeArch: %{ix86} - rutabaga-gfx-ffi ExclusiveArch: x86_64 aarch64 - s2n-tls ExcludeArch: %{ix86} ExcludeArch: s390x - s390utils ExcludeArch: %{ix86} - sac ExclusiveArch: %{java_arches} noarch - saclib ExcludeArch: %{ix86} - safeint ExcludeArch: %{ix86} - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - sandia-omega-h ExcludeArch: %{ix86} s390x - sayonara ExcludeArch: %{ix86} - sbcl ExclusiveArch: %{ix86} x86_64 aarch64 %{power64} - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sblim-cim-client ExclusiveArch: %{java_arches} noarch - sblim-cim-client2 ExclusiveArch: %{java_arches} noarch - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - scalasca ExcludeArch: s390 s390x armv7hl i686 - scannotation ExclusiveArch: %{java_arches} noarch - scip ExcludeArch: %{ix86} - scorep ExcludeArch: s390 s390x armv7hl i686 - scx_c_schedulers ExcludeArch: %{ix86} - sdl-hercules ExcludeArch: %{ix86} - sdljava ExclusiveArch: %{java_arches} - sdrangel ExclusiveArch: %{qt5_qtwebengine_arches} - sdrpp ExcludeArch: i686 - sdsl-lite ExclusiveArch: %{power64} x86_64 aarch64 - sdubby ExclusiveArch: %{efi} - seabios ExclusiveArch: x86_64 - seadrive-gui ExclusiveArch: %{qt6_qtwebengine_arches} - seafile-client ExclusiveArch: %{qt6_qtwebengine_arches} - seamonkey ExclusiveArch: x86_64 - sedutil ExcludeArch: ppc ppc64 ppc64le s390 s390x - sentencepiece ExcludeArch: s390x - seqan3 ExclusiveArch: %{power64} x86_64 aarch64 - sequeler ExcludeArch: %{ix86} - sequence-library ExclusiveArch: %{java_arches} noarch - servicelog ExclusiveArch: ppc %{power64} - setserial ExcludeArch: s390 s390x - sexpp ExcludeArch: %{ix86} - sfnt2woff-zopfli ExcludeArch: %{ix86} - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} ExcludeArch: %{ix86} ExcludeArch: %{arm} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - shotcut ExcludeArch: %{ix86} - sigil ExclusiveArch: %{qt5_qtwebengine_arches} ExcludeArch: %{ix86} - sigul ExclusiveArch: x86_64 ExcludeArch: %{ix86} - singularity-ce ExclusiveArch: %{go_arches} ExcludeArch: %{ix86} - siril ExcludeArch: %{ix86} - sisu ExclusiveArch: %{java_arches} noarch - skanpage ExclusiveArch: %{qt6_qtwebengine_arches} - ski ExcludeArch: %{ix86} ExcludeArch: aarch64 - skopeo ExclusiveArch: %{golang_arches_future} ExclusiveArch: aarch64 ppc64le s390x x86_64 - skrooge ExclusiveArch: %{qt6_qtwebengine_arches} - skychart ExclusiveArch: %{fpc_arches} ExcludeArch: %{ix86} - slapi-nis ExcludeArch: %{ix86} - sleef ExcludeArch: %{ix86} - slf4j ExclusiveArch: %{java_arches} noarch - slic3r ExcludeArch: %{ix86} ExcludeArch: ppc ppc64 s390 s390x %{ix86} ExcludeArch: ppc ppc64 s390 s390x - slick-greeter ExcludeArch: %{ix86} - slimdata ExcludeArch: ppc64 ppc sparcv9 sparc64 - slirp4netns ExclusiveArch: %{golang_arches_future} - slurm ExcludeArch: armv7hl ExcludeArch: i686 - smartmontools ExcludeArch: %{ix86} - snapd ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x} - snapshot ExcludeArch: %{ix86} - snip ExclusiveArch: %{java_arches} noarch - socnetv ExcludeArch: i686 - softnet-stat ExclusiveArch: %{rust_arches} - solidity ExcludeArch: %{ix86} - soplex ExcludeArch: %{ix86} - sound-juicer ExcludeArch: s390 s390x - soundmodem ExcludeArch: i686 - soup-sharp ExclusiveArch: %{mono_arches} - sourcextractor++ ExcludeArch: %{ix86} - spacebar ExclusiveArch: %{java_arches} - sparkleshare ExclusiveArch: %{mono_arches} ExcludeArch: %{ix86} - spasm ExcludeArch: %{ix86} - spec-version-maven-plugin ExclusiveArch: %{java_arches} noarch - spec2nii ExcludeArch: %{ix86} - speed-dreams ExcludeArch: s390x - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 - spice-parent ExclusiveArch: %{java_arches} noarch - springlobby ExclusiveArch: %{ix86} x86_64 - spyder ExcludeArch: %{ix86} ExclusiveArch: %{qt5_qtwebengine_arches} noarch - squeekboard ExcludeArch: %{ix86} - squirrel ExcludeArch: %{ix86} - sse2neon ExclusiveArch: aarch64 - stats-collect ExclusiveArch: %{ix86} x86_64 noarch - statsd ExclusiveArch: %{nodejs_arches} noarch - statserial ExcludeArch: s390 s390x - steinberg-bravura-fonts ExcludeArch: %{ix86} - steinberg-petaluma-fonts ExcludeArch: %{ix86} - stellarium ExcludeArch: armv7hl - stlsplit ExcludeArch: %{ix86} - stp ExcludeArch: %{ix86} - stratis-cli ExclusiveArch: %{rust_arches} noarch ExcludeArch: i686 - stratisd ExclusiveArch: %{rust_arches} ExcludeArch: i686 ExclusiveArch: %{rust_arches} ExcludeArch: i686 ExclusiveArch: %{rust_arches} ExcludeArch: i686 - string-template-maven-plugin ExclusiveArch: %{java_arches} noarch - stringtemplate ExclusiveArch: %{java_arches} noarch - stringtemplate4 ExclusiveArch: %{java_arches} noarch - stripesnoop ExclusiveArch: %{ix86} x86_64 - subscription-manager-cockpit ExclusiveArch: %{nodejs_arches} noarch - supercollider ExclusiveArch: %{qt5_qtwebengine_arches} - supermin ExcludeArch: %{ix86} ExclusiveArch: %{kernel_arches} ExcludeArch: %{power64} - supernovas ExcludeArch: %{ix86} - supertux ExcludeArch: s390x - suricata ExcludeArch: ppc64le i686 - svt-vp9 ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - swiftlint ExclusiveArch: x86_64 aarch64 - swing-layout ExclusiveArch: %{java_arches} noarch - symengine ExcludeArch: %{ix86} - symfpu ExcludeArch: %{ix86} - symmetrica ExcludeArch: %{ix86} - sympol ExcludeArch: %{ix86} - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - system-rules ExclusiveArch: %{java_arches} noarch - systemd-boot ExclusiveArch: %efi - t-digest ExclusiveArch: %{java_arches} noarch - taglib-sharp ExclusiveArch: %{mono_arches} - tagsoup ExclusiveArch: %{java_arches} noarch - tarantool ExclusiveArch: %{ix86} x86_64 - tboot ExclusiveArch: %{ix86} x86_64 - tcmu-runner ExcludeArch: i686 armv7hl - tdlib ExclusiveArch: x86_64 aarch64 - teem ExcludeArch: %{ix86} - tellico ExclusiveArch: %{qt6_qtwebengine_arches} - templates_parser ExclusiveArch: %{GPRbuild_arches} - terminology ExcludeArch: s390x - terminus-fonts ExcludeArch: %{grub2_exclude_arches} - ternimal ExclusiveArch: %{rust_arches} - testcloud ExclusiveArch: %{kernel_arches} noarch - testng ExclusiveArch: %{java_arches} noarch - texlive ExclusiveArch: %{java_arches} noarch - texmaker ExclusiveArch: %{qt6_qtwebengine_arches} ExcludeArch: ppc64 ppc64le s390x - thermald ExclusiveArch: %{ix86} x86_64 - thunderbird ExcludeArch: armv7hl ExcludeArch: s390x - tiled ExcludeArch: %{ix86} - tilix ExclusiveArch: %{ldc_arches} - tinygo ExcludeArch: ppc64le s390x ExcludeArch: %{ix86} - tlf ExcludeArch: i686 - tokodon ExclusiveArch: %{qt6_qtwebengine_arches} - tomboy ExclusiveArch: %{mono_arches} - tomcat ExclusiveArch: %{java_arches} noarch - tomcat-jakartaee-migration ExclusiveArch: %{java_arches} noarch - tomcat-native ExclusiveArch: %{java_arches} - tomcat-taglibs-parent ExclusiveArch: %{java_arches} noarch - torbrowser-launcher ExclusiveArch: %{ix86} x86_64 - touchegg ExcludeArch: %{ix86} - trace-cmd ExcludeArch: %{ix86} %{arm} - trafficserver ExcludeArch: %{arm} %{ix86} s390x - treelayout ExclusiveArch: %{java_arches} noarch - trilead-ssh2 ExclusiveArch: %{java_arches} noarch - trojita ExcludeArch: ppc64 ppc64le s390x - trunk ExcludeArch: %{ix86} - trustee-guest-components ExclusiveArch: x86_64 - tth ExcludeArch: %{ix86} - tucnak ExcludeArch: i686 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - tvtime ExcludeArch: s390 s390x - typescript ExclusiveArch: %{nodejs_arches} noarch - tzdata ExcludeArch: i686 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - uboot-tools ExcludeArch: s390x - ucx ExclusiveArch: aarch64 ppc64le x86_64 riscv64 - udev-hid-bpf ExcludeArch: %{ix86} - uglify-js ExclusiveArch: %{nodejs_arches} noarch - ugrep ExcludeArch: %{ix86} - umr ExclusiveArch: x86_64 aarch64 ppc64le - unetbootin ExclusiveArch: %{ix86} x86_64 - unicorn ExcludeArch: s390x - unison ExcludeArch: %{ix86} - univocity-parsers ExclusiveArch: %{java_arches} noarch - ursa-major ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 - usbip ExcludeArch: s390x - usd ExclusiveArch: aarch64 x86_64 - usnic-tools ExcludeArch: %{arm} - utop ExcludeArch: %{ix86} - uv ExcludeArch: %{ix86} - uwsgi ExcludeArch: %{ix86} - v-hacd ExcludeArch: %{ix86} - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - vakzination ExclusiveArch: %{java_arches} - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - valijson ExcludeArch: %{ix86} - valkey ExcludeArch: %{ix86} - vaultwarden ExcludeArch: ppc64le s390x ExcludeArch: i686 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vcpkg ExcludeArch: %{ix86} - vdo ExcludeArch: %{ix86} - vdr-tvscraper ExcludeArch: armv7hl - vecmath1.2 ExclusiveArch: %{java_arches} noarch - vectorscan ExcludeArch: s390x - velocity ExclusiveArch: %{java_arches} noarch - viking ExcludeArch: s390x %{ix86} - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - vim-perl-support ExcludeArch: %{ix86} - vim-syntastic ExclusiveArch: %{java_arches} noarch - vinci ExcludeArch: %{ix86} - virt-p2v ExclusiveArch: x86_64 - virt-top ExcludeArch: %{ix86} ExcludeArch: %{power64} - virt-v2v ExcludeArch: %{ix86} ExclusiveArch: x86_64 - virtiofsd ExclusiveArch: %{rust_arches} ExcludeArch: i686 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - visidata ExcludeArch: %{ix86} - visualboyadvance-m ExcludeArch: %{ix86} s390x - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vkmark ExcludeArch: s390x - vmaf ExclusiveArch: x86_64 - voms-api-java ExclusiveArch: %{java_arches} noarch - voms-clients-java ExclusiveArch: %{java_arches} noarch - vosk-api ExclusiveArch: x86_64 aarch64 ppc64le - votca ExcludeArch: %{ix86} - vrq ExclusiveArch: %{ix86} x86_64 - vultr-cli ExcludeArch: ppc64le s390x - vxl ExcludeArch: %{ix86} - wangle ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - warzone2100 ExcludeArch: %{ix86} - wasmedge ExclusiveArch: x86_64 aarch64 - wcstools ExcludeArch: %{ix86} - wdt ExclusiveArch: x86_64 aarch64 ppc64le - webkit2-sharp ExclusiveArch: %mono_arches - weld-parent ExclusiveArch: %{java_arches} noarch - whipper ExcludeArch: s390x - whisper-cpp ExclusiveArch: x86_64 aarch64 ppc64le - why3 ExclusiveArch: %{ocaml_native_compiler} - widevine-installer ExclusiveArch: aarch64 - wildcard ExcludeArch: %{ix86} - wine ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} - wine-dxvk ExclusiveArch: %{ix86} x86_64 - wine-mono ExcludeArch: aarch64 %{power64} s390x s390 - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExcludeArch: ppc64 ppc64le - wivrn ExcludeArch: s390x - wlmaker ExcludeArch: %{ix86} - woff ExcludeArch: %{ix86} - ws-commons-util ExclusiveArch: %{java_arches} noarch - wsdl4j ExclusiveArch: %{java_arches} noarch - wsjtx ExcludeArch: i686 - wult ExclusiveArch: x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x2gokdrive ExcludeArch: %{ix86} - x86-simd-sort ExclusiveArch: x86_64 - xalan-j2 ExclusiveArch: %{java_arches} noarch - xaos ExcludeArch: %{ix86} - xapps ExcludeArch: %{ix86} - xbean ExclusiveArch: %{java_arches} noarch - xbyak ExclusiveArch: x86_64 - xbyak_aarch64 ExclusiveArch: aarch64 - xdg-desktop-portal ExcludeArch: %{ix86} - xdg-desktop-portal-cosmic ExcludeArch: %{ix86} - xdg-desktop-portal-gnome ExcludeArch: %{ix86} - xdg-desktop-portal-gtk ExcludeArch: %{ix86} - xdg-desktop-portal-hyprland ExcludeArch: %{ix86} - xe-guest-utilities-latest ExclusiveArch: %{ix86} x86_64 - xed ExcludeArch: %{ix86} - xen ExclusiveArch: x86_64 aarch64 - xephem ExcludeArch: %{ix86} - xerces-j2 ExclusiveArch: %{java_arches} noarch - xeus ExcludeArch: %{ix86} - xeus-zmq ExcludeArch: %{ix86} - xfce4-sensors-plugin ExcludeArch: s390 s390x - xfce4-systemload-plugin ExcludeArch: %{ix86} - xgap ExcludeArch: %{ix86} - xiphos ExcludeArch: ppc64 - xlog ExcludeArch: i686 - xmedcon ExcludeArch: %{ix86} - xml-commons-apis ExclusiveArch: %{java_arches} noarch - xml-commons-resolver ExclusiveArch: %{java_arches} noarch - xml-maven-plugin ExclusiveArch: %{java_arches} noarch - xmlada ExclusiveArch: %{GPRbuild_arches} - xmlgraphics-commons ExclusiveArch: %{java_arches} noarch - xmlpull ExclusiveArch: %{java_arches} noarch - xmlstreambuffer ExclusiveArch: %{java_arches} noarch - xmlunit ExclusiveArch: %{java_arches} noarch - xmvn ExclusiveArch: %{java_arches} noarch - xmvn-connector-ivy ExclusiveArch: %{java_arches} noarch - xmvn-generator ExclusiveArch: %{java_arches} - xnnpack ExclusiveArch: x86_64 aarch64 - xnvme ExcludeArch: %{ix86} - xorg-x11-drv-amdgpu ExcludeArch: s390 s390x - xorg-x11-drv-ati ExcludeArch: s390 s390x - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-nouveau ExcludeArch: s390 s390x - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-qxl ExcludeArch: s390 s390x - xorg-x11-drv-synaptics ExcludeArch: s390 s390x - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xreader ExcludeArch: %{ix86} - xrgears ExcludeArch: %{ix86} - xsensors ExcludeArch: %{ix86} - xsp ExclusiveArch: %mono_arches - xstream ExclusiveArch: %{java_arches} noarch - xtb ExcludeArch: s390x - xtensor-python ExcludeArch: armv7hl ppc64le s390x - xz-java ExclusiveArch: %{java_arches} noarch - yarnpkg ExclusiveArch: %{nodejs_arches} - yices ExcludeArch: %{ix86} - yle-dl ExcludeArch: %{ix86} - yosys ExcludeArch: %{ix86} ExcludeArch: s390x - zcfan ExclusiveArch: x86_64 - zeal ExclusiveArch: aarch64 x86_64 - zenon ExclusiveArch: %{ocaml_native_compiler} - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zfs-fuse ExcludeArch: s390 s390x aarch64 - zig ExclusiveArch: %{zig_arches} - zile ExcludeArch: ppc64le - zimpl ExcludeArch: %{ix86} - zlib-ada ExclusiveArch: %{GPRbuild_arches} - zola ExclusiveArch: %{rust_arches} - zstr ExcludeArch: %{ix86} - zswap-cli ExcludeArch: %{ix86} - zxcvbn-c ExcludeArch: %{ix86} - zycore-c ExcludeArch: s390x - zydis ExcludeArch: s390x - zynaddsubfx ExcludeArch: i686

1 0

Jump to page: