From 8b2043c39271f4118d8a8bed5e6254da6a4693f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 28 Jun 2015 11:39:22 +0200 Subject: [PATCH] - up to 3.7.0 --- povray-ax_boost_base.m4 | 2 +- povray.spec | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/povray-ax_boost_base.m4 b/povray-ax_boost_base.m4 index 54a2a1b..8d03e0e 100644 --- a/povray-ax_boost_base.m4 +++ b/povray-ax_boost_base.m4 @@ -92,7 +92,7 @@ if test "x$want_boost" = "xyes"; then libsubdirs="lib" ax_arch=`uname -m` if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then - libsubdirs="lib64 lib lib64" + libsubdirs="lib64 libx32 lib" fi dnl first we check the system location for boost libraries diff --git a/povray.spec b/povray.spec index a769d57..2a2c5b3 100644 --- a/povray.spec +++ b/povray.spec @@ -4,23 +4,16 @@ %bcond_with pvm # - with PVM support %bcond_with svga # - with svgalib support (doesn't work on many platforms) # -%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.%{_rc}.%{rel} +Version: 3.7.0.0 +Release: 1 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: 7d24ec051af67bcf040a898a267d920a -# based on sources from CVS at http://pvmpov.sourceforge.net/ -# Source0: %{name}-%{version}-%{snap}.tar.gz +Source0: https://github.com/POV-Ray/povray/archive/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: c9473256677808e9e3246e6eb8f69a75 Source1: %{name}-ax_boost_base.m4 Patch0: %{name}-nouserfiles.patch Patch1: boost-1.50.patch @@ -102,14 +95,16 @@ Plik wykonywalny The Persistence of Vision(tm) Ray-Tracer dla PVM/xwin. %prep -%setup -q -n %{name}-%{_src_pov_ver} +%setup -q cp %{SOURCE1} unix/config/ax_boost_base.m4 -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 %build -%{__aclocal} -%{__autoconf} +cd unix +./prebuild.sh +cd .. + %{__automake} COMPILED_BY="PLD/Linux Team";export COMPILED_BY; %if %{with x} && %{with pvm} -- 2.43.0