- boost rebuild

[packages/povray.git] / povray.spec

diff --git a/povray.spec b/povray.spec
index 0e0902bcfc30df9b038b15d86645ed58defa6584..a769d578d8245eccba2f682022ab856033bcd992 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -4,23 +4,26 @@
 %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.RC3
+%define                _rc             RC7
+%define                _src_pov_ver    3.7.0.%{_rc}
+%define                rel             9
 
 Summary:       Persistence of Vision Ray Tracer
 Summary(pl.UTF-8):     Persistence of Vision Ray Tracer
 Name:          povray
 Version:       3.7.0
-Release:       0.RC3.2
+Release:       0.%{_rc}.%{rel}
 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.bz2
-# Source0-md5: 66480f1ca6b1b1b5198605b6caf3f8e8
+# Source0-md5: 7d24ec051af67bcf040a898a267d920a
 # 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 +105,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 +117,7 @@ COMPILED_BY="PLD/Linux Team";export COMPILED_BY;
        --libdir=%{_datadir} \
        --enable-pvm \
        --with-pvm-arch=%{_pvmarch} \
-       --with-pvm-libs=%{_libdir} \
-       --x-includes=/usr/X11R6/include \
-       --x-libraries=/usr/X11R6/%{_lib}
+       --with-pvm-libs=%{_libdir}
 %{__make}
 install unix/povray x-pvmpov
 %endif
@@ -135,9 +137,7 @@ install unix/povray pvmpov
 
 %if %{with x}
 %configure \
-       --libdir=%{_datadir} \
-       --x-includes=/usr/X11R6/include \
-       --x-libraries=/usr/X11R6/%{_lib}
+       --libdir=%{_datadir}
 %{__make}
 install unix/povray x-povray
 %{__make} clean
@@ -148,15 +148,16 @@ install unix/povray x-povray
        --without-x
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/usr/X11R6/bin}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_datadir}}
 %if %{with pvm}
 install -d $RPM_BUILD_ROOT%{_pvmroot}/bin/%{_pvmarch}
 %endif
 
 %{__make} install \
+       INSTALL="install -c -D" \
+       mkdir_p="mkdir -p" \
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with x}