- upgrade to 3R4

Changed files:
    Radiance.spec -> 1.6

diff --git a/Radiance.spec b/Radiance.spec
index 47f8d9ead3f8460ac668d4c83741d1e5c42e8c30..ad852dda1606979e9ce36d517e880d89df11297a 100644 (file)
--- a/Radiance.spec
+++ b/Radiance.spec
@@ -1,11 +1,12 @@
 Summary:       Radiance 3D Photo-Realistic Renderer
 Summary(pl):   Fotorealistyczny program do renderowania scen 3D.
 Name:          Radiance
 Summary:       Radiance 3D Photo-Realistic Renderer
 Summary(pl):   Fotorealistyczny program do renderowania scen 3D.
 Name:          Radiance

-Version:       3r1p8
+Version:       3R4

 Release:       1
 License:       free use, but non-distributable
 Group:         Applications/Graphics
 Release:       1
 License:       free use, but non-distributable
 Group:         Applications/Graphics

-Source0:       http://radsite.lbl.gov/radiance/pub/rad%{version}.tar.Z
+Source0:       http://radsite.lbl.gov/radiance/pub/rad%{version}.tar.gz
+Source1:       http://radsite.lbl.gov/radiance/pub/patch%{version}p1.tar.gz

 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-rview-conflict.patch
 NoSource:      0
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-rview-conflict.patch
 NoSource:      0


@@ -20,19 +21,21 @@ Zaawansowany program do modelowania scen 3D.
 
 %prep
 %setup  -q -n ray
 
 %prep
 %setup  -q -n ray

+tar xvfz %{SOURCE1}

 %patch0 -p1
 %patch0 -p1

-%patch1 -p1
+#%patch1 -p0

 
 

-(cd doc/man/man1 ; mv -f rview.1 radview.1)
+#(cd doc/man/man1 ; mv -f rview.1 radview.1)
+install -d src/lib

 
 %build
 
 %build

-for i in common meta cv gen ot rt px util cal/{ev,calc,rcalc,util}; do
+for i in common meta cv gen ot rt px hd util cal/{ev,calc,rcalc,util}; do

     make -C src/$i -f Rmakefile \
     make -C src/$i -f Rmakefile \

-       OPT="%{rpmcflags}" CC="%{__cc}" \
+       OPT="%{rpmcflags} -DSPEED=200" CC="%{__cc}" \

        ARCH="IBMPC" \
        ARCH="IBMPC" \

-       MACH="-DBSD -Dlinux -DSPEED=40 -DDCL_ATOF -DBIGMEM -L/usr/X11R6/lib" \
+       MACH="-DBSD -Dlinux -Dtracktime=0 -DDCL_ATOF -DBIGMEM -DNOSTEREO -L/usr/X11R6/lib -I/usr/include/X11" \

        MLIBDIR="%{_libdir}/ray/meta" \
        MLIBDIR="%{_libdir}/ray/meta" \

-       COMPAT="malloc.o erf.o getpagesize.o"
+       COMPAT="bmalloc.o erf.o getpagesize.o"

 done
        
 %install
 done
        
 %install


@@ -43,20 +46,22 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/ray,%{_mandir}/man{1,3,5}}
 tar cf - * | tar xf - -C $RPM_BUILD_ROOT%{_libdir}/ray
 )
 
 tar cf - * | tar xf - -C $RPM_BUILD_ROOT%{_libdir}/ray
 )
 

-for i in meta cv gen ot rt px util cal/{ev,calc,rcalc,util}; do
+for i in meta cv gen ot rt px hd util cal/{ev,calc,rcalc,util}; do

     make -C src/$i -f Rmakefile install \
        "DESTDIR=$RPM_BUILD_ROOT" \
        "INSTDIR=%{_bindir}" \
        "LIBDIR=%{_libdir}/ray"
 done
 
     make -C src/$i -f Rmakefile install \
        "DESTDIR=$RPM_BUILD_ROOT" \
        "INSTDIR=%{_bindir}" \
        "LIBDIR=%{_libdir}/ray"
 done
 

+# fix for inproper links
+for i in fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 rgb2ycbcr.1 sgi2tiff.1 thumbnail.1; do 
+       ln -sf ../../../src/px/tiff/man/$i doc/man/man1/
+done
+

 for i in 1 3 5; do
        install doc/man/man$i/*.$i $RPM_BUILD_ROOT%{_mandir}/man$i
 done
 
 for i in 1 3 5; do
        install doc/man/man$i/*.$i $RPM_BUILD_ROOT%{_mandir}/man$i
 done
 

-# note: doc/*.1 are ordinary groff files, not manuals
-gzip -9nf doc/ps/* doc/notes/* doc/digest/* README doc/*.1
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -65,4 +70,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/ray
 %{_mandir}/man?/*
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/ray
 %{_mandir}/man?/*

-%doc doc/ps doc/notes/* doc/digest doc/*.1.gz README.gz
+%doc doc/ps doc/notes/* doc/*.1* README*