X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=povray.spec;h=7f4454386bb34023f76e82cf5100340f0ee1bd92;hb=2c916a3ac3c502f83596665fb3acf526fd9776f9;hp=ace877d52b1d829b0e27a4bb420b942c3aa9528b;hpb=fa42bede1ef2302c439e091ab42c28c09b9f8b7d;p=packages%2Fpovray.git

diff --git a/povray.spec b/povray.spec
index ace877d..7f44543 100644
--- a/povray.spec
+++ b/povray.spec
@@ -1,20 +1,32 @@
+#
+# Conditional build:
+# _without_x	- without X11 subpackage
+# _without_pvm	- [temporarily disabled by default] without PVM support
+#
 Summary:	Persistence of Vision Ray Tracer
 Summary(pl):	Persistence of Vision Ray Tracer
 Name:		povray
-Version:	3.1g
-Release:	4
-Copyright:	distrituable
+Version:	3.50c
+Release:	1
+License:	distributable
 Group:		Applications/Graphics
-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
-Patch0:		%{name}-makefile_and_config.patch
+Source1:	%{name}-%{version}.md5sum
+Patch0:		%{name}-legal.patch
+Patch1:		%{name}-types.patch
+# pvm support not yet available - http://pvmpov.sourceforge.net/
 URL:		http://www.povray.org/
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel >= 1.0.8
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
 BuildRequires:	zlib-devel
-BuildRequires:	libpng >= 1.0.8
-BuildRequires:	XFree86-devel
+%{!?_without_x:BuildRequires:XFree86-devel}
+#%{!?_without_pvm:BuildRequires:pvm-devel >= 3.4.3-24 }
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libdir		%{_datadir}
+
 %description
 The Persistence of Vision(tm) Ray-Tracer creates three-dimensional,
 photo-realistic images using a rendering technique called ray-tracing.
@@ -37,48 +49,107 @@ efektami, tj. odbicia 
 
 %package X11
 Summary:	X Window povray executable
+Summary(pl):	povray pod X Window
 Group:		Applications/Graphics
-Group(pl):	Aplikacje/Grafika
 Requires:	%{name} = %{version}
 
 %description X11
 The Persistence of Vision(tm) Ray-Tracer X Window executable.
 
-%prep
-%setup -q -n povray31 -b 1
+%description X11 -l pl
+Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla X
+Window.
+
+%package pvm
+Summary:	PVM/unix povray executable
+Group:		Applications/Graphics
+Requires:	%{name} = %{version}
+
+%description pvm
+The Persistence of Vision(tm) Ray-Tracer PVM/unix executable.
+
+%description X11 -l pl
+Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla
+PVM/unix.
+
+%package pvm-X11
+Summary:	PVM/xwin povray executable
+Group:		Applications/Graphics
+Requires:	%{name} = %{version}
+
+%description pvm-X11
+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.
 
+%prep
+cd %{_sourcedir}
+md5sum -c %{name}-%{version}.md5sum
+cd -
+%setup -q
 %patch0 -p1
+%ifarch alpha
+%patch1 -p1
+%endif
 
 %build
-cd source/unix
-%{__make} newunix newxwin OPT_FLAGS="$RPM_OPT_FLAGS"
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%if %{!?_without_x:1}%{?_without_x:0}
+%configure \
+	--x-includes=%{_prefix}/X11R6/include \
+	--x-libraries=%{_prefix}/X11R6/lib
+%{__make}
+install src/povray x-povray
+%{__make} clean
+%endif
+
+%configure \
+	--without-x
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},/etc/skel,%{_mandir}/man1,%{_datadir}/povray31}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_prefix}/X11R6/bin}
 
-install -s source/unix/{povray,x-povray} $RPM_BUILD_ROOT%{_bindir}
-install source/unix/povrayrc $RPM_BUILD_ROOT/etc/skel/.povrayrc
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install povray.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%if %{!?_without_x:1}%{?_without_x:0}
+install x-povray $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+%endif
 
-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 \
-	$RPM_BUILD_ROOT%{_mandir}/man1/*
+install povray.ini $RPM_BUILD_ROOT%{_sysconfdir}
+ln -sf %{_sysconfdir}/povray.ini $RPM_BUILD_ROOT%{_datadir}/povray-3.5/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