- boost rebuild

[packages/povray.git] / povray.spec

diff --git a/povray.spec b/povray.spec
index be6712dd3f98184c635e0e951fdf6c1b9616682b..a769d578d8245eccba2f682022ab856033bcd992 100644 (file)
--- a/povray.spec
+++ b/povray.spec
@@ -1,30 +1,29 @@
 #
 # Conditional build:
 %bcond_without x       # - without X11 subpackage
-%bcond_with    pvm             # - with PVM support
+%bcond_with    pvm     # - with PVM support
 %bcond_with    svga    # - with svgalib support (doesn't work on many platforms)
 #
-%define                _src_pov_ver    3.6.1
+%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.6.1
-Release:       11
+Version:       3.7.0
+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-md5: b5789bb7eeaed0809c5c82d0efda571d
+#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: 7d24ec051af67bcf040a898a267d920a
 # based on sources from CVS at http://pvmpov.sourceforge.net/
 # Source0:     %{name}-%{version}-%{snap}.tar.gz
-Patch0:                %{name}-legal.patch
-Patch1:                %{name}-64bit.patch
-Patch2:                %{name}-X-libs.patch
-Patch3:                %{name}-lib64.patch
-Patch4:                %{name}-no_svgalib.patch
-Patch5:                %{name}-m4.patch
-Patch6:                %{name}-png.patch
+Source1:       %{name}-ax_boost_base.m4
+Patch0:                %{name}-nouserfiles.patch
+Patch1:                boost-1.50.patch
 URL:           http://www.povray.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -103,17 +102,10 @@ Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla
 PVM/xwin.
 
 %prep
-%setup -q
-##%patch1 -p1
-##%patch2 -p1
-%if "%{_lib}" == "lib64"
-##%patch3 -p1
-%endif
-%if !%{with svga}
-##%patch4 -p1
-%endif
-%patch5 -p1
-%patch6 -p1
+%setup -q -n %{name}-%{_src_pov_ver}
+cp %{SOURCE1} unix/config/ax_boost_base.m4
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -125,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
@@ -147,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
@@ -160,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}
@@ -193,14 +182,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* doc/povlegal.doc doc/*.txt doc/html
+%doc AUTHORS ChangeLog NEWS README* changes.txt
 %attr(755,root,root) %{_bindir}/povray
 %{_datadir}/povray*
 %{_docdir}/povray*
 %{_mandir}/man?/*
 %dir %{_sysconfdir}/povray
-%dir %{_sysconfdir}/povray/3.6
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/3.6/povray.*
+%dir %{_sysconfdir}/povray/3.7
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/3.7/povray.*
 ## %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/povray.*
 
 %if %{with x}