- merged DEVEL branch

Changed files:
    povray.spec -> 1.29

diff --git a/povray.spec b/povray.spec
index d03b178c6f7c976599e1ec2fe5ba98dfa79d5b24..935d8caffceccf548fd744d325d708a469c27a36 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -1,28 +1,26 @@
+# _without_x
+# _without_pvm
 Summary:       Persistence of Vision Ray Tracer
 Summary(pl):   Persistence of Vision Ray Tracer
 Name:          povray
-Version:       3.1g
-Release:       5
+Version:       3.50b
+Release:       1
 License:       distributable
 Group:         Applications/Graphics
 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
+Patch0:                %{name}-legal.patch
+# pvm support not yet available - http://pvmpov.sourceforge.net/
 URL:           http://www.povray.org/
-BuildRequires: zlib-devel
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
+BuildRequires: zlib-devel
 %{!?_without_x:BuildRequires:XFree86-devel}
-%{!?_without_pvm:BuildRequires:pvm-devel >= 3.4.3-24 }
+#%{!?_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//')
+%define                _libdir         %{_datadir}
 
 %description
 The Persistence of Vision(tm) Ray-Tracer creates three-dimensional,
@@ -44,7 +42,6 @@ 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
@@ -57,9 +54,7 @@ The Persistence of Vision(tm) Ray-Tracer X Window executable.
 %description X11 -l pl
 Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla X
 Window.
-%endif
 
-%if %{!?_without_pvm:1}%{?_without_pvm:0}
 %package pvm
 Summary:       PVM/unix povray executable
 Group:         Applications/Graphics
@@ -72,7 +67,6 @@ The Persistence of Vision(tm) Ray-Tracer PVM/unix executable.
 Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla
 PVM/unix.
 
-%if %{!?_without_x:1}%{?_without_x:0}
 %package pvm-X11
 Summary:       PVM/xwin povray executable
 Group:         Applications/Graphics
@@ -84,62 +78,59 @@ The Persistence of Vision(tm) Ray-Tracer PVM/xwin executable.
 %description X11 -l pl
 Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla
 PVM/xwin.
-%endif
-%endif
 
 %prep
-%setup -q -n povray31 -b 1
+%setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
 
 %build
-cd source/unix
-%{__make} newunix %{!?_without_x:newxwin} %{!?_without_pvm:newunix_pvm %{!?_without_x:newxwin_pvm}} OPT_FLAGS="%{rpmcflags}"
+%configure \
+       --x-includes=%{_prefix}/X11R6/include \
+       --x-libraries=%{_prefix}/X11R6/lib
+%{__make}
+install src/povray x-povray
+%{__make} clean
+
+%configure \
+       --without-x
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},/etc/skel,%{_mandir}/man1,%{_datadir}/povray31,%{_pvm_root}/bin/%{_pvm_arch}}
-
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_prefix}/X11R6/bin}
 
-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
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-install povray.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-cp -r allscene include scenes $RPM_BUILD_ROOT%{_datadir}/povray31
-install *.ini *.pov $RPM_BUILD_ROOT%{_datadir}/povray31
-
-gzip -9nf gamma.gif.txt povlegal.doc povuser.txt
+install x-povray $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install povray.ini $RPM_BUILD_ROOT%{_sysconfdir}
+ln -sf %{_sysconfdir}/povray.ini $RPM_BUILD_ROOT%{_datadir}/povray-*/povray.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc gamma.gif.txt.gz povuser.txt.gz gamma.gif povlegal.doc.gz
+%doc AUTHORS ChangeLog NEWS README* povlegal.doc *.txt doc/html
 %attr(755,root,root) %{_bindir}/povray
-%{_datadir}/povray31
-/etc/skel/.povrayrc
-%{_mandir}/man1/*
+%{_libdir}/povray*
+%{_mandir}/man?/*
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/povray.ini
 
 %if %{!?_without_x:1}%{?_without_x:0}
 %files X11
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/x-povray
+%attr(755,root,root) %{_prefix}/X11R6/bin/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
+#%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