From 94f1f65e2dae8aeb8fff25d4e711fdbed6433d08 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 22 May 2007 21:16:27 +0000 Subject: [PATCH 01/12] Initial release --- .cvsignore | 1 + sources | 1 + yafray-0.0.9-soname.patch | 22 ++++++++ yafray.spec | 102 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 yafray-0.0.9-soname.patch create mode 100644 yafray.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f2c00f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +yafray-0.0.9.tar.gz diff --git a/sources b/sources index e69de29..06dbb5d 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7365122e0ca6f439988f51e8b4db935c yafray-0.0.9.tar.gz diff --git a/yafray-0.0.9-soname.patch b/yafray-0.0.9-soname.patch new file mode 100644 index 0000000..1db4575 --- /dev/null +++ b/yafray-0.0.9-soname.patch @@ -0,0 +1,22 @@ +--- yafray/src/interface/SConscript.soname 2006-10-14 19:56:16.000000000 +0200 ++++ yafray/src/interface/SConscript 2006-10-14 19:56:54.000000000 +0200 +@@ -18,7 +18,7 @@ + interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files, + SHLIBSUFFIX='.so') + else: +- interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files) ++ interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files, SHLINKFLAGS = interface_env['SHLINKFLAGS'] + ' -Wl,-soname=libyafrayplugin.so.0') + + interface_env.Depends(interface,'../yafraycore') + interface_env.Install(config.libpath,interface) +--- yafray/src/yafraycore/SConscript.soname 2006-10-14 19:57:20.000000000 +0200 ++++ yafray/src/yafraycore/SConscript 2006-10-14 19:57:51.000000000 +0200 +@@ -47,7 +47,7 @@ + core_env.Append (LIBPATH = config.exr.libpath + config.pthread.libpath) + + core_env.Install(config.libpath, +-core_env.SharedLibrary (target='yafraycore', source=source_files, ++core_env.SharedLibrary (target='yafraycore', source=source_files, SHLINKFLAGS = core_env['SHLINKFLAGS'] + ' -Wl,-soname=libyafraycore.so.0', + LIBS=config.pthread.libs + config.exr.libs)) + + core_env.Alias('install_core',config.libpath) diff --git a/yafray.spec b/yafray.spec new file mode 100644 index 0000000..2c29622 --- /dev/null +++ b/yafray.spec @@ -0,0 +1,102 @@ +Name: yafray +Version: 0.0.9 +Release: 2%{?dist} +Summary: Yet Another Free RAYtracer + +Group: Applications/Multimedia +License: LGPL +URL: http://www.yafray.org +Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz +Patch0: yafray-0.0.9-soname.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: OpenEXR-devel +BuildRequires: scons + +%description +Yafray is yet another free raytracer, still in development. Some +features like caustics, filters, depth of field, etc. are implemented. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q -n %{name} +%patch0 -p1 -b .soname +#sed -i "s|/usr/local|%{_prefix}|" linux-settings.py +sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py +sed -i "s|/lib|/%{_lib}|" linux-settings.py +chmod 0644 ChangeLog AUTHORS LICENSE COPYING NEWS README +find src -name '*.h' -exec chmod 0644 {} ';' +find src -name '*.cc' -exec chmod 0644 {} ';' + + +%build +CXXFLAGS="$RPM_OPT_FLAGS" scons prefix=%{_prefix} + + +%install +rm -rf $RPM_BUILD_ROOT +scons prefix=$RPM_BUILD_ROOT%{_prefix} install +rm -f $RPM_BUILD_ROOT%{_bindir}/.sconsign +rm -f $RPM_BUILD_ROOT%{_libdir}/.sconsign +rm -f $RPM_BUILD_ROOT%{_libdir}/yafray/.sconsign +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +install -pm 0644 $RPM_BUILD_ROOT%{_prefix}/etc/gram.yafray $RPM_BUILD_ROOT%{_sysconfdir} +rm -rf $RPM_BUILD_ROOT%{_prefix}/etc +for i in libyafraycore libyafrayplugin ;do + mv $RPM_BUILD_ROOT%{_libdir}/$i.so $RPM_BUILD_ROOT%{_libdir}/$i.so.%{version} + ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so.0 + ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so +done + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc ChangeLog AUTHORS LICENSE README +%{_bindir}/yafray +%{_libdir}/lib*.so.* +%{_libdir}/yafray/ +%config(noreplace) %{_sysconfdir}/gram.yafray + +%files devel +%defattr(-,root,root,-) +%doc ChangeLog AUTHORS LICENSE README +%{_libdir}/lib*.so + + +%changelog +* Sun May 20 2007 kwizart < kwizart at gmail.com > - 0.0.9-2 +- Fix /lib is /lib64 on x86_64 and ppc64 + +* Sat Oct 14 2006 Gerard Milmeister - 0.0.9-1 +- new version 0.0.9 + +* Sun Jun 18 2006 Gerard Milmeister - 0.0.8-2 +- BR: OpenEXR-devel +- use $RPM_OPT_FLAGS + +* Fri Jul 8 2005 Gerard Milmeister - 0.0.8-1 +- New Version 0.0.8 + +* Tue Mar 23 2004 Gerard Milmeister - 0:0.0.6-0.fdr.1 +- First Fedora release From c9b77f4bb4380e026a420fff5e48b427fa7e2048 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 26 Aug 2007 14:33:42 +0000 Subject: [PATCH 02/12] - Rebuild for BuildID - Update the License field --- yafray.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yafray.spec b/yafray.spec index 2c29622..6d9ef32 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,10 +1,10 @@ Name: yafray Version: 0.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia -License: LGPL +License: LGPLv2+ URL: http://www.yafray.org Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz Patch0: yafray-0.0.9-soname.patch @@ -85,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 26 2007 kwizart < kwizart at gmail.com > - 0.0.9-3 +- Rebuild for BuildID +- Update the License field + * Sun May 20 2007 kwizart < kwizart at gmail.com > - 0.0.9-2 - Fix /lib is /lib64 on x86_64 and ppc64 From 00deafa5745ce62b1ef897ca9edd75789a33003f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 15 Oct 2007 14:22:35 +0000 Subject: [PATCH 03/12] Rebuild --- yafray.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yafray.spec b/yafray.spec index 6d9ef32..961ddad 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -11,7 +11,7 @@ Patch0: yafray-0.0.9-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: libjpeg-devel -BuildRequires: OpenEXR-devel +BuildRequires: OpenEXR-devel >= 1.6.0 BuildRequires: scons %description @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-4 +- Rebuild + * Sun Aug 26 2007 kwizart < kwizart at gmail.com > - 0.0.9-3 - Rebuild for BuildID - Update the License field From cb0fadf8673599cfe274aabdfaf46cde3e45627b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 24 Nov 2007 22:30:08 +0000 Subject: [PATCH 04/12] - Fix: yafray libs are dlopened --- yafray-0.0.9-soname.patch | 22 ---------------------- yafray.spec | 32 +++++++++----------------------- 2 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 yafray-0.0.9-soname.patch diff --git a/yafray-0.0.9-soname.patch b/yafray-0.0.9-soname.patch deleted file mode 100644 index 1db4575..0000000 --- a/yafray-0.0.9-soname.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- yafray/src/interface/SConscript.soname 2006-10-14 19:56:16.000000000 +0200 -+++ yafray/src/interface/SConscript 2006-10-14 19:56:54.000000000 +0200 -@@ -18,7 +18,7 @@ - interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files, - SHLIBSUFFIX='.so') - else: -- interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files) -+ interface=interface_env.SharedLibrary (target='yafrayplugin', source=source_files, SHLINKFLAGS = interface_env['SHLINKFLAGS'] + ' -Wl,-soname=libyafrayplugin.so.0') - - interface_env.Depends(interface,'../yafraycore') - interface_env.Install(config.libpath,interface) ---- yafray/src/yafraycore/SConscript.soname 2006-10-14 19:57:20.000000000 +0200 -+++ yafray/src/yafraycore/SConscript 2006-10-14 19:57:51.000000000 +0200 -@@ -47,7 +47,7 @@ - core_env.Append (LIBPATH = config.exr.libpath + config.pthread.libpath) - - core_env.Install(config.libpath, --core_env.SharedLibrary (target='yafraycore', source=source_files, -+core_env.SharedLibrary (target='yafraycore', source=source_files, SHLINKFLAGS = core_env['SHLINKFLAGS'] + ' -Wl,-soname=libyafraycore.so.0', - LIBS=config.pthread.libs + config.exr.libs)) - - core_env.Alias('install_core',config.libpath) diff --git a/yafray.spec b/yafray.spec index 961ddad..c09b678 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,37 +1,29 @@ Name: yafray Version: 0.0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia License: LGPLv2+ URL: http://www.yafray.org Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz -Patch0: yafray-0.0.9-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: libjpeg-devel -BuildRequires: OpenEXR-devel >= 1.6.0 +BuildRequires: OpenEXR-devel BuildRequires: scons +Obsoletes: yafray-devel + + %description Yafray is yet another free raytracer, still in development. Some features like caustics, filters, depth of field, etc. are implemented. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - %prep %setup -q -n %{name} -%patch0 -p1 -b .soname #sed -i "s|/usr/local|%{_prefix}|" linux-settings.py sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py sed -i "s|/lib|/%{_lib}|" linux-settings.py @@ -53,11 +45,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/yafray/.sconsign mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} install -pm 0644 $RPM_BUILD_ROOT%{_prefix}/etc/gram.yafray $RPM_BUILD_ROOT%{_sysconfdir} rm -rf $RPM_BUILD_ROOT%{_prefix}/etc -for i in libyafraycore libyafrayplugin ;do - mv $RPM_BUILD_ROOT%{_libdir}/$i.so $RPM_BUILD_ROOT%{_libdir}/$i.so.%{version} - ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so.0 - ln -fs $i.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$i.so -done %clean @@ -74,17 +61,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc ChangeLog AUTHORS LICENSE README %{_bindir}/yafray -%{_libdir}/lib*.so.* +%{_libdir}/lib*.so %{_libdir}/yafray/ %config(noreplace) %{_sysconfdir}/gram.yafray -%files devel -%defattr(-,root,root,-) -%doc ChangeLog AUTHORS LICENSE README -%{_libdir}/lib*.so %changelog +* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-5 +- Fix: yafray libs are dlopened + * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-4 - Rebuild From d69282b05140852cbd3cb52ed2f366eaa63ade3f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 4 Jan 2008 19:31:36 +0000 Subject: [PATCH 05/12] Fix gcc43 --- yafray-0.0.9-gcc43.patch | 98 ++++++++++++++++++++++++++++++++++++++++ yafray.spec | 7 ++- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 yafray-0.0.9-gcc43.patch diff --git a/yafray-0.0.9-gcc43.patch b/yafray-0.0.9-gcc43.patch new file mode 100644 index 0000000..d3d084c --- /dev/null +++ b/yafray-0.0.9-gcc43.patch @@ -0,0 +1,98 @@ +--- src/loader/mlex.cc ++++ src/loader/mlex.cc +@@ -31,6 +31,8 @@ + #define WARNING cerr<<"[Warning]: " + #define ERROR cerr<<"[Error]: " + ++#include ++ + char sops[]={ + '<', + '>', +--- src/shaders/basictex.cc ++++ src/shaders/basictex.cc +@@ -31,6 +31,8 @@ + #include "EXR_io.h" + #endif + ++#include ++ + using namespace std; + + __BEGIN_YAFRAY +--- src/yafraycore/HDR_io.cc ++++ src/yafraycore/HDR_io.cc +@@ -9,6 +9,8 @@ + #include + #endif + ++#include ++ + __BEGIN_YAFRAY + + //--------------------------------------------------------------------------- +--- src/yafraycore/buffer.h ++++ src/yafraycore/buffer.h +@@ -31,6 +31,8 @@ + #include + #include "color.h" + ++#include ++ + __BEGIN_YAFRAY + + template +--- src/yafraycore/ccthreads.cc ++++ src/yafraycore/ccthreads.cc +@@ -1,6 +1,8 @@ + #include"ccthreads.h" + #include + ++#include ++ + using namespace std; + + namespace yafthreads { +--- src/yafraycore/geometree.h ++++ src/yafraycore/geometree.h +@@ -1,6 +1,8 @@ + #ifndef __GEOMETREE_H + #define __GEOMETREE_H + ++#include ++ + #include"bound.h" + + __BEGIN_YAFRAY +--- src/yafraycore/renderblock.cc ++++ src/yafraycore/renderblock.cc +@@ -1,6 +1,8 @@ + + #include "renderblock.h" + ++#include ++ + using namespace std; + + __BEGIN_YAFRAY +--- src/yafraycore/kdtree.cc ++++ src/yafraycore/kdtree.cc +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + __BEGIN_YAFRAY + +--- src/yafraycore/targaIO.cc ++++ src/yafraycore/targaIO.cc +@@ -3,6 +3,7 @@ + //-------------------------------------------------------------------------------- + #include "targaIO.h" + #include "vector3d.h" ++#include + + //-------------------------------------------------------------------------------- + // Save uncompressed 24 bit targa + diff --git a/yafray.spec b/yafray.spec index c09b678..f38cae3 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,12 +1,13 @@ Name: yafray Version: 0.0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia License: LGPLv2+ URL: http://www.yafray.org Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz +Patch0: yafray-0.0.9-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -24,6 +25,7 @@ features like caustics, filters, depth of field, etc. are implemented. %prep %setup -q -n %{name} +%patch0 -p0 -b .gcc43 #sed -i "s|/usr/local|%{_prefix}|" linux-settings.py sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py sed -i "s|/lib|/%{_lib}|" linux-settings.py @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.0.9-6 +- Fix gcc43 + * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-5 - Fix: yafray libs are dlopened From 3bebd960a4a028921f7735150324e7d8431066ff Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 9 Feb 2008 15:08:37 +0000 Subject: [PATCH 06/12] - Rebuild for gcc43 --- yafray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yafray.spec b/yafray.spec index f38cae3..0d3096a 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.0.9-7 +- Rebuild for gcc43 + * Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.0.9-6 - Fix gcc43 From 69c9ddcc31d0878efa1ea38bfca7b9e74cc729e2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:03:36 +0000 Subject: [PATCH 07/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- yafray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yafray.spec b/yafray.spec index 0d3096a..ad07d0c 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.0.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.0.9-7 - Rebuild for gcc43 From 75850f02ac8595901f1f66d377d3bca80b8fbdc3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 2 Mar 2009 10:33:00 +0000 Subject: [PATCH 08/12] Fix for gcc44 --- yafray-0.0.9-gcc44.patch | 12 ++++++++++++ yafray.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 yafray-0.0.9-gcc44.patch diff --git a/yafray-0.0.9-gcc44.patch b/yafray-0.0.9-gcc44.patch new file mode 100644 index 0000000..ecedd3b --- /dev/null +++ b/yafray-0.0.9-gcc44.patch @@ -0,0 +1,12 @@ +diff -up yafray/src/shaders/basictex.cc.gcc44 yafray/src/shaders/basictex.cc +--- yafray/src/shaders/basictex.cc.gcc44 2009-03-02 11:26:49.000000000 +0100 ++++ yafray/src/shaders/basictex.cc 2009-03-02 11:27:25.000000000 +0100 +@@ -261,7 +261,7 @@ textureImage_t::textureImage_t(const cha + intp_type = BICUBIC; + + // Load image, try to determine from extensions first +- char *ext = strrchr(filename, '.'); ++ const char *ext = strrchr(filename, '.'); + bool jpg_tried = false; + bool tga_tried = false; + bool hdr_tried = false; diff --git a/yafray.spec b/yafray.spec index ad07d0c..7d0ffba 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -8,6 +8,7 @@ License: LGPLv2+ URL: http://www.yafray.org Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz Patch0: yafray-0.0.9-gcc43.patch +Patch1: yafray-0.0.9-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -26,6 +27,7 @@ features like caustics, filters, depth of field, etc. are implemented. %prep %setup -q -n %{name} %patch0 -p0 -b .gcc43 +%patch1 -p1 -b .gcc44 #sed -i "s|/usr/local|%{_prefix}|" linux-settings.py sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py sed -i "s|/lib|/%{_lib}|" linux-settings.py @@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.0.9-9 +- Fix gcc44 + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d221f3fbad0438ddb36552543c2ad497d1096606 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:51:46 +0000 Subject: [PATCH 09/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- yafray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yafray.spec b/yafray.spec index 7d0ffba..eb9bb5b 100644 --- a/yafray.spec +++ b/yafray.spec @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.0.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.0.9-9 - Fix gcc44 From 62b4183c479d61fc4ba56f8b71cc3109400870dd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:34 +0000 Subject: [PATCH 10/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3538fe9..a59ff31 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yafray -# $Id$ +# $Id: Makefile,v 1.1 2007/05/22 19:16:18 spot Exp $ NAME := yafray SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 11269f39a1640184329fbc214e2978581107a6e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:18:37 +0000 Subject: [PATCH 11/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a59ff31..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yafray -# $Id: Makefile,v 1.1 2007/05/22 19:16:18 spot Exp $ -NAME := yafray -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b2c1ce0fe06c7d3a96e1b67d4e4ab244c6441e23 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 7 Nov 2010 18:18:23 +0100 Subject: [PATCH 12/12] Dead package procedure --- .gitignore | 1 - dead.package | 3 ++ sources | 1 - yafray-0.0.9-gcc43.patch | 98 --------------------------------- yafray-0.0.9-gcc44.patch | 12 ----- yafray.spec | 114 --------------------------------------- 6 files changed, 3 insertions(+), 226 deletions(-) create mode 100644 dead.package delete mode 100644 yafray-0.0.9-gcc43.patch delete mode 100644 yafray-0.0.9-gcc44.patch delete mode 100644 yafray.spec diff --git a/.gitignore b/.gitignore index f2c00f9..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +0,0 @@ -yafray-0.0.9.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1dda354 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +This package is deprecated against yafr[a]ray +It was needed by blender older than 2.49, +current blender 2.49b uses yafaray only. diff --git a/sources b/sources index 06dbb5d..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -7365122e0ca6f439988f51e8b4db935c yafray-0.0.9.tar.gz diff --git a/yafray-0.0.9-gcc43.patch b/yafray-0.0.9-gcc43.patch deleted file mode 100644 index d3d084c..0000000 --- a/yafray-0.0.9-gcc43.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- src/loader/mlex.cc -+++ src/loader/mlex.cc -@@ -31,6 +31,8 @@ - #define WARNING cerr<<"[Warning]: " - #define ERROR cerr<<"[Error]: " - -+#include -+ - char sops[]={ - '<', - '>', ---- src/shaders/basictex.cc -+++ src/shaders/basictex.cc -@@ -31,6 +31,8 @@ - #include "EXR_io.h" - #endif - -+#include -+ - using namespace std; - - __BEGIN_YAFRAY ---- src/yafraycore/HDR_io.cc -+++ src/yafraycore/HDR_io.cc -@@ -9,6 +9,8 @@ - #include - #endif - -+#include -+ - __BEGIN_YAFRAY - - //--------------------------------------------------------------------------- ---- src/yafraycore/buffer.h -+++ src/yafraycore/buffer.h -@@ -31,6 +31,8 @@ - #include - #include "color.h" - -+#include -+ - __BEGIN_YAFRAY - - template ---- src/yafraycore/ccthreads.cc -+++ src/yafraycore/ccthreads.cc -@@ -1,6 +1,8 @@ - #include"ccthreads.h" - #include - -+#include -+ - using namespace std; - - namespace yafthreads { ---- src/yafraycore/geometree.h -+++ src/yafraycore/geometree.h -@@ -1,6 +1,8 @@ - #ifndef __GEOMETREE_H - #define __GEOMETREE_H - -+#include -+ - #include"bound.h" - - __BEGIN_YAFRAY ---- src/yafraycore/renderblock.cc -+++ src/yafraycore/renderblock.cc -@@ -1,6 +1,8 @@ - - #include "renderblock.h" - -+#include -+ - using namespace std; - - __BEGIN_YAFRAY ---- src/yafraycore/kdtree.cc -+++ src/yafraycore/kdtree.cc -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - __BEGIN_YAFRAY - ---- src/yafraycore/targaIO.cc -+++ src/yafraycore/targaIO.cc -@@ -3,6 +3,7 @@ - //-------------------------------------------------------------------------------- - #include "targaIO.h" - #include "vector3d.h" -+#include - - //-------------------------------------------------------------------------------- - // Save uncompressed 24 bit targa - diff --git a/yafray-0.0.9-gcc44.patch b/yafray-0.0.9-gcc44.patch deleted file mode 100644 index ecedd3b..0000000 --- a/yafray-0.0.9-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up yafray/src/shaders/basictex.cc.gcc44 yafray/src/shaders/basictex.cc ---- yafray/src/shaders/basictex.cc.gcc44 2009-03-02 11:26:49.000000000 +0100 -+++ yafray/src/shaders/basictex.cc 2009-03-02 11:27:25.000000000 +0100 -@@ -261,7 +261,7 @@ textureImage_t::textureImage_t(const cha - intp_type = BICUBIC; - - // Load image, try to determine from extensions first -- char *ext = strrchr(filename, '.'); -+ const char *ext = strrchr(filename, '.'); - bool jpg_tried = false; - bool tga_tried = false; - bool hdr_tried = false; diff --git a/yafray.spec b/yafray.spec deleted file mode 100644 index eb9bb5b..0000000 --- a/yafray.spec +++ /dev/null @@ -1,114 +0,0 @@ -Name: yafray -Version: 0.0.9 -Release: 10%{?dist} -Summary: Yet Another Free RAYtracer - -Group: Applications/Multimedia -License: LGPLv2+ -URL: http://www.yafray.org -Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz -Patch0: yafray-0.0.9-gcc43.patch -Patch1: yafray-0.0.9-gcc44.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel -BuildRequires: libjpeg-devel -BuildRequires: OpenEXR-devel -BuildRequires: scons - -Obsoletes: yafray-devel - - -%description -Yafray is yet another free raytracer, still in development. Some -features like caustics, filters, depth of field, etc. are implemented. - - - -%prep -%setup -q -n %{name} -%patch0 -p0 -b .gcc43 -%patch1 -p1 -b .gcc44 -#sed -i "s|/usr/local|%{_prefix}|" linux-settings.py -sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py -sed -i "s|/lib|/%{_lib}|" linux-settings.py -chmod 0644 ChangeLog AUTHORS LICENSE COPYING NEWS README -find src -name '*.h' -exec chmod 0644 {} ';' -find src -name '*.cc' -exec chmod 0644 {} ';' - - -%build -CXXFLAGS="$RPM_OPT_FLAGS" scons prefix=%{_prefix} - - -%install -rm -rf $RPM_BUILD_ROOT -scons prefix=$RPM_BUILD_ROOT%{_prefix} install -rm -f $RPM_BUILD_ROOT%{_bindir}/.sconsign -rm -f $RPM_BUILD_ROOT%{_libdir}/.sconsign -rm -f $RPM_BUILD_ROOT%{_libdir}/yafray/.sconsign -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 0644 $RPM_BUILD_ROOT%{_prefix}/etc/gram.yafray $RPM_BUILD_ROOT%{_sysconfdir} -rm -rf $RPM_BUILD_ROOT%{_prefix}/etc - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc ChangeLog AUTHORS LICENSE README -%{_bindir}/yafray -%{_libdir}/lib*.so -%{_libdir}/yafray/ -%config(noreplace) %{_sysconfdir}/gram.yafray - - - -%changelog -* Mon Jul 27 2009 Fedora Release Engineering - 0.0.9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.0.9-9 -- Fix gcc44 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.0.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.0.9-7 -- Rebuild for gcc43 - -* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.0.9-6 -- Fix gcc43 - -* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-5 -- Fix: yafray libs are dlopened - -* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-4 -- Rebuild - -* Sun Aug 26 2007 kwizart < kwizart at gmail.com > - 0.0.9-3 -- Rebuild for BuildID -- Update the License field - -* Sun May 20 2007 kwizart < kwizart at gmail.com > - 0.0.9-2 -- Fix /lib is /lib64 on x86_64 and ppc64 - -* Sat Oct 14 2006 Gerard Milmeister - 0.0.9-1 -- new version 0.0.9 - -* Sun Jun 18 2006 Gerard Milmeister - 0.0.8-2 -- BR: OpenEXR-devel -- use $RPM_OPT_FLAGS - -* Fri Jul 8 2005 Gerard Milmeister - 0.0.8-1 -- New Version 0.0.8 - -* Tue Mar 23 2004 Gerard Milmeister - 0:0.0.6-0.fdr.1 -- First Fedora release