rpms/tachyon/devel tachyon.spec,1.9,1.10

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	tachyon.spec 
Log Message:
* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at 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



Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tachyon.spec	19 Feb 2008 20:52:48 -0000	1.9
+++ tachyon.spec	26 Sep 2008 17:42:37 -0000	1.10
@@ -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 @@
 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 @@
   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 @@
 %{_datadir}/tachyon
 
 %changelog
+* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at 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 at fedoraproject.org> - 0.98-0.6.20070319
 - Autorebuild for GCC 4.3