marge UNSTABLE branch and final fixes

Changed files:
    povray.spec -> 1.20

diff --git a/povray.spec b/povray.spec
index 7991ef003a6ed7db892f8f029734f0361ac1e964..9de18d7fe68526784ea5ef276833e8971393355b 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -9,13 +9,23 @@ Group(de):    Applikationen/Grafik
 Group(pl):     Aplikacje/Grafika
 Source0:       ftp://ftp.povray.org/pub/povray/Official/Unix/povuni_s.tgz
 Source1:       ftp://ftp.povray.org/pub/povray/Official/Unix/povuni_d.tgz
+# pvm.patch is instead of that source, and its based on it
+#Source2:      pvmpov-3.1e2.tgz
 Patch0:                %{name}-makefile_and_config.patch
+Patch1:                %{name}-pvm.patch
+Patch2:                %{name}-png_with_pvm.patch
 URL:           http://www.povray.org/
 BuildRequires: zlib-devel
-BuildRequires: libpng >= 1.0.8
-BuildRequires: XFree86-devel
+BuildRequires: libpng-devel >= 1.0.8
+%{!?_without_x:BuildRequires:XFree86-devel}
+%{!?_without_pvm:BuildRequires:pvm-devel >= 3.4.3-24 }
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+#ugly but now _pvm_root/_pvm_arch isnt defined in macros
+
+%define                _pvm_root       %{_libdir}/pvm3
+%define                _pvm_arch       %(ls %{pvm_root}/conf/|sed -e 's/\.def//')
+
 %description
 The Persistence of Vision(tm) Ray-Tracer creates three-dimensional,
 photo-realistic images using a rendering technique called ray-tracing.
@@ -36,6 +46,7 @@ pliku tekstowym. Ray-tracing nie pozwala na szybkie tworzenie obraz
 ale za to twórca otrzymuje wyskokiej jako¶ci bitmapy z realistycznymi
 efektami, tj. odbicia ¶wiat³a, cienie, perspektywa i inne.
 
+%if %{!?_without_x:1}%{?_without_x}
 %package X11
 Summary:       X Window povray executable
 Summary(pl):   povray pod X Window
@@ -46,20 +57,51 @@ Requires:   %{name} = %{version}
 
 %description X11
 The Persistence of Vision(tm) Ray-Tracer X Window executable.
+%endif
+
+%if %{!?_without_pvm:1}%{?_without_pvm:0}
+%package pvm
+Summary:       PVM/unix povray executable
+Group:         Applications/Graphics
+Group(de):     Applikationen/Grafik
+Group(pl):     Aplikacje/Grafika
+Requires:      %{name} = %{version}
+
+%description pvm
+The Persistence of Vision(tm) Ray-Tracer PVM/unix executable.
+
+%if %{!?_without_x:1}%{?_without_x:0}
+%package pvm-X11
+Summary:       PVM/xwin povray executable
+Group:         Applications/Graphics
+Group(de):     Applikationen/Grafik
+Group(pl):     Aplikacje/Grafika
+Requires:      %{name} = %{version}
+
+%description pvm-X11
+The Persistence of Vision(tm) Ray-Tracer PVM/xwin executable.
+%endif
+%endif
 
 %prep
-%setup -q -n povray31 -b 1
+%setup -q -n povray31 -b 1 
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 cd source/unix
-%{__make} newunix newxwin OPT_FLAGS="%{rpmcflags}"
+%{__make} newunix %{!?_without_x:newxwin} %{!?_without_pvm:newunix_pvm %{!?_without_x:newxwin_pvm}} OPT_FLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},/etc/skel,%{_mandir}/man1,%{_datadir}/povray31}
+install -d $RPM_BUILD_ROOT{%{_bindir},/etc/skel,%{_mandir}/man1,%{_datadir}/povray31,%{_pvm_root}/bin/%{_pvm_arch}}
+
 
-install source/unix/{povray,x-povray} $RPM_BUILD_ROOT%{_bindir}
+install source/unix/povray $RPM_BUILD_ROOT%{_bindir}
+%{!?_without_x:install source/unix/x-povray $RPM_BUILD_ROOT%{_bindir}}
+%{!?_without_pvm:install source/unix/pvmpov $RPM_BUILD_ROOT%{_pvm_root}/bin/%{_pvm_arch}}
+%{!?_without_pvm:%{!?_without_x:install source/unix/x-pvmpov $RPM_BUILD_ROOT%{_pvm_root}/bin/%{_pvm_arch}}}
 install source/unix/povrayrc $RPM_BUILD_ROOT/etc/skel/.povrayrc
 
 install povray.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -80,6 +122,20 @@ rm -rf $RPM_BUILD_ROOT
 /etc/skel/.povrayrc
 %{_mandir}/man1/*
 
+%if %{!?_without_x:1}%{?_without_x:0}
 %files X11
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/x-povray
+%endif
+
+%if %{!?_without_pvm:1}%{?_without_pvm:0}
+%files pvm
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pvm_root}/bin/%{_pvm_arch}/pvmpov
+
+%if %{!?_without_x:1}%{?_without_x:0}
+%files pvm-X11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pvm_root}/bin/%{_pvm_arch}/x-pvmpov
+%endif
+%endif