- added XFree86-devel to BuildRequires,

- removed bashism from %prep and %build (pushd/popd),
- simplifications in prep, %build and %install,
- added missing %attr() for binaries in %files.

Changed files:
    povray.spec -> 1.7

diff --git a/povray.spec b/povray.spec
index 1efbed0ff9af70d86a8a622aea11e4c94945c41c..ea6fdcbcd50027289862479a40509fc6aa38ca85 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -12,70 +12,58 @@ Patch:              povray-makefile_and_config.patch
 URL:           http://www.povray.org/
 BuildRequires: zlib-devel
 BuildRequires: libpng-devel
+BuildRequires: XFree86-devel
 BuildRoot:     /tmp/%{name}-%{version}-root
 
 %description
-From the user manual:
-
 The Persistence of Vision(tm) Ray-Tracer creates three-dimensional,
-photo-realistic images using a rendering technique called ray-tracing. It reads
-in a text file containing information describing the objects and lighting in a
-scene and generates an image of that scene from the view point of a camera also
-described in the text file. Ray-tracing is not a fast process by any means,
-but it produces very high quality images with realistic reflections, shading,
-perspective and other effects.
+photo-realistic images using a rendering technique called ray-tracing. It
+reads in a text file containing information describing the objects and
+lighting in a scene and generates an image of that scene from the view point
+of a camera also described in the text file. Ray-tracing is not a fast
+process by any means, but it produces very high quality images with
+realistic reflections, shading, perspective and other effects.
 
 %description -l pl
-Z podrêcznika u¿ytkownika:
-
 Persistence of Vision(tm) Ray-Tracer tworzy trójwymiarowe, fotorealistyczne
 obrazy za pomoc± techniki renderingu zwanej ray-tracing. Program pobiera z
 pliku tekstowego informacje opisuj±ce obiekty oraz ¶wiat³o przedstawianego
-¶wiata, a nastêpnie generuje rysunek z punktu widzenia kamery, która tak¿e jest
-definiowana w w/w pliku tekstowym. Ray-tracing nie pozwala na szybkie tworzenie
-obrazów, ale za to twórca otrzymuje wyskokiej jako¶ci bitmapy z realistycznymi
-efektami, tj. odbicia ¶wiat³a, cienie, perspektywa i inne.
+¶wiata, a nastêpnie generuje rysunek z punktu widzenia kamery, która tak¿e
+jest definiowana w w/w pliku tekstowym. Ray-tracing nie pozwala na szybkie
+tworzenie obrazów, ale za to twórca otrzymuje wyskokiej jako¶ci bitmapy z
+realistycznymi efektami, tj. odbicia ¶wiat³a, cienie, perspektywa i inne.
 
 %prep
-%setup -q -n povray31
-pushd ..
-tar zxf %{SOURCE1}
-popd
+%setup -q -n povray31 -b 1
 
 %patch0 -p1
 
 %build
-pushd source/unix
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DCPU=`echo %{_target_cpu} | sed 's/^i\([3-9]86\)$/\1/'`"
-make newunix
-make newxwin
-popd
+cd source/unix
+OPT_FLAGS="$RPM_OPT_FLAGS"
+make newunix newxwin OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
-pushd source/unix
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT/etc/skel
-install -s -m 755 povray x-povray $RPM_BUILD_ROOT%{_bindir}
-install -m 644 povrayrc $RPM_BUILD_ROOT/etc/skel/.povrayrc
-popd
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},/etc/skel,%{_mandir}/man1,%{_datadir}/povray31}
+
+install -s source/unix/{povray,x-povray} $RPM_BUILD_ROOT%{_bindir}
+install source/unix/povrayrc $RPM_BUILD_ROOT/etc/skel/.povrayrc
 
 gzip -9nf gamma.gif.txt povray.1 povlegal.doc povuser.txt
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 povray.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
+install povray.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
 
-install -d $RPM_BUILD_ROOT%{_datadir}/povray31
 find . -type f -exec chmod 644 {} \;
 cp -r allscene include scenes $RPM_BUILD_ROOT%{_datadir}/povray31
-install -m 644 *.ini $RPM_BUILD_ROOT%{_datadir}/povray31
-install -m 644 *.pov $RPM_BUILD_ROOT%{_datadir}/povray31
+install *.ini *.pov $RPM_BUILD_ROOT%{_datadir}/povray31
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %doc gamma.gif.txt.gz povuser.txt.gz gamma.gif povlegal.doc.gz
-%{_bindir}/x-povray
+%attr(755,root,root) %{_bindir}/x-povray
 %{_bindir}/povray
 %{_datadir}/povray31
 /etc/skel/.povrayrc