Release 2

[packages/povray.git] / povray.spec

diff --git a/povray.spec b/povray.spec
index 3454adb30dd14a3c8f55e22aa676fad72fdb295f..f881670915c838c7a47cbdbcd5acdb627cfb66f3 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -4,23 +4,25 @@
 %bcond_with    pvm     # - with PVM support
 %bcond_with    svga    # - with svgalib support (doesn't work on many platforms)
 #
-%define                _src_pov_ver    3.7.0.RC5
+%define                _rc             RC6
+%define                _src_pov_ver    3.7.0.%{_rc}
 
 Summary:       Persistence of Vision Ray Tracer
 Summary(pl.UTF-8):     Persistence of Vision Ray Tracer
 Name:          povray
 Version:       3.7.0
-Release:       0.RC5.2
+Release:       0.%{_rc}.2
 Epoch:         1
 License:       distributable
 Group:         Applications/Graphics
 #Source0:      http://www.povray.org/ftp/pub/povray/Official/Unix/%{name}-%{_src_pov_ver}.tar.bz2
 Source0:       http://www.povray.org/redirect/www.povray.org/beta/source/%{name}-%{_src_pov_ver}.tar.gz
-# Source0-md5: d272acba3c4116796b061703c0cfa97d
+# Source0-md5: e441015262acfa60949082dbc7995493
 # based on sources from CVS at http://pvmpov.sourceforge.net/
 # Source0:     %{name}-%{version}-%{snap}.tar.gz
 Source1:       %{name}-ax_boost_base.m4
 Patch0:                %{name}-nouserfiles.patch
+Patch1:                boost-1.50.patch
 URL:           http://www.povray.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -102,6 +104,7 @@ PVM/xwin.
 %setup -q -n %{name}-%{_src_pov_ver}
 cp %{SOURCE1} unix/config/ax_boost_base.m4
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -113,9 +116,7 @@ COMPILED_BY="PLD/Linux Team";export COMPILED_BY;
        --libdir=%{_datadir} \
        --enable-pvm \
        --with-pvm-arch=%{_pvmarch} \
-       --with-pvm-libs=%{_libdir} \
-       --x-includes=%{_includedir}/X11 \
-       --x-libraries=%{_libdir}
+       --with-pvm-libs=%{_libdir}
 %{__make}
 install unix/povray x-pvmpov
 %endif
@@ -135,9 +136,7 @@ install unix/povray pvmpov
 
 %if %{with x}
 %configure \
-       --libdir=%{_datadir} \
-       --x-includes=%{_includedir}/X11 \
-       --x-libraries=%{_libdir}
+       --libdir=%{_datadir}
 %{__make}
 install unix/povray x-povray
 %{__make} clean
@@ -148,15 +147,16 @@ install unix/povray x-povray
        --without-x
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_datadir}}
 %if %{with pvm}
 install -d $RPM_BUILD_ROOT%{_pvmroot}/bin/%{_pvmarch}
 %endif
 
-%{__make} -j1 install \
+%{__make} install \
+       INSTALL="install -c -D" \
+       mkdir_p="mkdir -p" \
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with x}