Hello community, here is the log from the commit of package povray for openSUSE:Factory:NonFree checked in at 2015-05-15 07:44:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/povray (Old) and /work/SRC/openSUSE:Factory:NonFree/.povray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "povray" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/povray/povray.changes 2013-07-16 16:13:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.povray.new/povray.changes 2015-05-15 07:44:59.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 22 12:40:08 UTC 2015 - g...@opensuse.org + +- update to version 3.7.0.0 + - see http://www.povray.org/download/changes.txt for a list of + changes +- relicensed as AGPL-3.0 (software) and CC-BY-SA-3.0 (includes, + examples) +- removed unused povray-3.6.9.7-TIME_UTC_.patch +- clean up spec file + +------------------------------------------------------------------- Old: ---- povray-3.6.9.7-TIME_UTC_.patch povray-3.7.0.RC7.tar.bz2 New: ---- v3.7.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ povray.spec ++++++ --- /var/tmp/diff_new_pack.1YdE7X/_old 2015-05-15 07:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.1YdE7X/_new 2015-05-15 07:45:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package povray # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,34 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define maj_version 3.7 +%define min_version 0.0 Name: povray -License: SUSE-NonFree -Group: Productivity/Graphics/Visualization/Raytracers -Version: 3.6.9.7 +Version: %{maj_version}.%{min_version} Release: 0 Summary: Ray Tracer +License: AGPL-3.0 and CC-BY-SA-3.0 +Group: Productivity/Graphics/Visualization/Raytracers Url: http://www.povray.org - -Source: povray-3.7.0.RC7.tar.bz2 -Patch1: povray-%{version}-ini.patch -Patch2: povray-%{version}-fix.patch -# boost changed TIME_UTC -> TIME_UTC_ -Patch3: povray-%{version}-TIME_UTC_.patch +Source: https://github.com/POV-Ray/povray/archive/v%{version}.tar.gz +Patch1: povray-3.6.9.7-ini.patch +Patch2: povray-3.6.9.7-fix.patch # make boost link -Patch4: povray-%{version}-boost-link.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch4: povray-3.6.9.7-boost-link.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel +BuildRequires: dos2unix +BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libX11-devel -BuildRequires: libjpeg-devel -BuildRequires: zlib-devel -BuildRequires: libSDL-devel -BuildRequires: openexr-devel +BuildRequires: xorg-x11-libXpm-devel +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(zlib) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Persistence of Vision Ray tracer creates three-dimensional, @@ -55,43 +56,62 @@ realistic reflections, shading, perspective, and other effects. %prep -%setup -q -n povray-3.7.0.RC7 +%setup -q %patch1 %patch2 -# boost changed TIME_UTC -> TIME_UTC_ -%if 0%{suse_version} > 1220 %patch4 -%endif + +# remove inline copies of shared libraries rm -rf libraries + +# add missing standard files +sed -i 's,automake --warnings=all,automake --warnings=all --add-missing,' \ + unix/prebuild.sh + +# fix wrong newline encoding +dos2unix -k unix/scripts/*.sh + %build -autoreconf -fi +( cd unix && ./prebuild.sh ) %ifarch %arm # work around ICE -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1" +RPM_OPT_FLAGS="%{optflags} -O1" %endif -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-multichar" CFLAGS="$CXXFLAGS"\ -%configure COMPILED_BY="SUSE LINUX Products GmbH, Nuernberg, Germany" \ - --disable-optimiz --with-boost-libdir=%{_libdir} +CXXFLAGS="%{optflags} -fno-strict-aliasing -Wno-multichar" CFLAGS="$CXXFLAGS" \ + %configure \ + COMPILED_BY="SUSE LINUX GmbH, Nuernberg, Germany" \ + --disable-strip \ + --disable-optimiz \ + --with-boost-libdir=%{_libdir} + +# fix up paths +sed -i -e 's,^DEFAULT_DIR=.*,DEFAULT_DIR=/usr,' scripts/* +sed -i -e 's,^SYSCONFDIR=.*,SYSCONFDIR=/etc,' scripts/* + make %{?_smp_mflags} -perl -pi -e 's,^DEFAULT_DIR=.*,DEFAULT_DIR=/usr,' scripts/* -perl -pi -e 's,^SYSCONFDIR=.*,SYSCONFDIR=/etc,' scripts/* %install -make DESTDIR=$RPM_BUILD_ROOT \ - povdocdir=%{_defaultdocdir}/%{name} \ +make DESTDIR=%{buildroot} \ + povdocdir=/deleteme \ install -# htmldir=%{_defaultdocdir}/%{name}/html \ -# imagesdir=%{_defaultdocdir}/%{name}/html/images \ -# vfaqdir=%{_defaultdocdir}/%{name}/html/images/vfaq \ -mkdir -p $RPM_BUILD_ROOT/etc -install -m 644 povray.conf $RPM_BUILD_ROOT/etc + +# this only contains the AUTHORS and changelog files, not the actual +# documentation +rm -rf %{buildroot}/deleteme + +# fix wrong permissions +chmod 755 %{buildroot}%{_datadir}/povray-%{maj_version}/scenes/camera/mesh_camera/bake.sh + +%fdupes %{buildroot}/%{_datadir} %files %defattr(-,root,root) -%config /etc/* -/usr/bin/povray -/usr/share/povray-3.7 -%{_mandir}/man*/* -%doc %{_defaultdocdir}/%{name} +%doc AUTHORS LICENSE README.md changes.txt revision.txt +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/%{maj_version} +%config(noreplace) %{_sysconfdir}/%{name}/%{maj_version}/%{name}.* +%{_bindir}/povray +%{_datadir}/povray-%{maj_version} +%{_mandir}/man1/povray.1* %changelog ++++++ povray-3.6.9.7-fix.patch ++++++ --- /var/tmp/diff_new_pack.1YdE7X/_old 2015-05-15 07:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.1YdE7X/_new 2015-05-15 07:45:01.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- source/backend/lighting/photons.cpp.orig +++ source/backend/lighting/photons.cpp -@@ -604,6 +604,9 @@ void PhotonTrace::ComputeLightedTexture( +@@ -545,6 +545,9 @@ void PhotonTrace::ComputeLightedTexture( threadData->passThruPrev = true; } // else die ++++++ povray-3.6.9.7-ini.patch ++++++ --- /var/tmp/diff_new_pack.1YdE7X/_old 2015-05-15 07:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.1YdE7X/_new 2015-05-15 07:45:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- ini/povray.ini -+++ ini/povray.ini -@@ -31,8 +31,8 @@ +Index: distribution/ini/povray.ini +=================================================================== +--- distribution/ini/povray.ini.orig ++++ distribution/ini/povray.ini +@@ -31,8 +31,8 @@ Height = 600 Bounding_Threshold = 3 ; ;
