Hello community, here is the log from the commit of package yafray checked in at Tue Nov 20 11:41:31 CET 2007. -------- --- yafray/yafray.changes 2007-11-12 10:02:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/yafray/yafray.changes 2007-11-20 11:08:57.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 20 11:08:26 CET 2007 - prusnak@suse.cz + +- split linux-settings.patch into 2 patches (for 32 and 64 bit archs) + +------------------------------------------------------------------- New: ---- yafray-0.0.9-linux-settings64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yafray.spec ++++++ --- /var/tmp/diff_new_pack.L13886/_old 2007-11-20 11:41:08.000000000 +0100 +++ /var/tmp/diff_new_pack.L13886/_new 2007-11-20 11:41:08.000000000 +0100 @@ -16,12 +16,13 @@ Group: Productivity/Graphics/Visualization/Raytracers AutoReqProv: on Version: 0.0.9 -Release: 3 +Release: 5 Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-gcc4-64bit.patch Patch1: %{name}-%{version}-gcc-warning.patch -Patch2: %{name}-%{version}-linux-settings.patch -Patch3: %{name}-%{version}-includes.patch +Patch2: %{name}-%{version}-includes.patch +Patch32: %{name}-%{version}-linux-settings.patch +Patch64: %{name}-%{version}-linux-settings64.patch Url: http://www.yafray.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: YafRay: Yet Another Free RAYtracer @@ -39,13 +40,16 @@ and others %prep -sed -i -e 's/@lib@/%_lib/g' %{P:2} %setup -q -n %{name} chmod -x AUTHORS ChangeLog LICENSE README %patch0 %patch1 %patch2 -%patch3 +if [ "%_lib" = "lib64" ]; then +%patch64 +else +%patch32 +fi %build scons prefix=%{_prefix} @@ -66,6 +70,8 @@ %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %changelog +* Tue Nov 20 2007 - prusnak@suse.cz +- split linux-settings.patch into 2 patches (for 32 and 64 bit archs) * Mon Nov 12 2007 - prusnak@suse.cz - added 2 more missing includes to includes.patch * Fri Nov 09 2007 - prusnak@suse.cz ++++++ yafray-0.0.9-linux-settings64.patch ++++++ --- linux-settings.py +++ linux-settings.py @@ -4,25 +4,28 @@ import globalinfo srcroot = os.getcwd() +destdir = '' prefix = '' def init(args): + global destdir global prefix + destdir = args.get('destdir','') prefix = args.get('prefix','/usr/local') -def get_libpath(args): return prefix+"/lib" -def get_pluginpath(args): return prefix+"/lib/yafray" -def get_binpath(args): return prefix+"/bin" -def get_confpath(args): return prefix+"/etc" +def get_libpath(args): return destdir+prefix+"/lib64" +def get_pluginpath(args): return destdir+prefix+"/lib64/yafray" +def get_binpath(args): return destdir+prefix+"/bin" +def get_confpath(args): return destdir+"/etc" def get_cxxflags(args): debug=args.get('debug',0) arch=args.get('arch','') tune=args.get('tune','') flags='-Wall -DHAVE_CONFIG_H -D_PTHREADS' if debug: - flags+=' -O3 -ffast-math -ggdb' + flags+=' $RPM_OPT_FLAGS -ffast-math -ggdb' else: - flags+=' -O3 -ffast-math -fomit-frame-pointer' + flags+=' $RPM_OPT_FLAGS -ffast-math -fomit-frame-pointer' if arch!='': flags+=' -march='+arch if tune!='': @@ -40,7 +43,7 @@ return False def get_include(args): return [ exr.PATH + "/include/OpenEXR" ] - def get_libpath(args): return [ exr.PATH + "/lib" ] + def get_libpath(args): return [ exr.PATH + "/lib64" ] def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half'] class jpeg(globalinfo.library): ++++++ yafray-0.0.9-linux-settings.patch ++++++ --- /var/tmp/diff_new_pack.L13886/_old 2007-11-20 11:41:08.000000000 +0100 +++ /var/tmp/diff_new_pack.L13886/_new 2007-11-20 11:41:08.000000000 +0100 @@ -17,8 +17,8 @@ -def get_pluginpath(args): return prefix+"/lib/yafray" -def get_binpath(args): return prefix+"/bin" -def get_confpath(args): return prefix+"/etc" -+def get_libpath(args): return destdir+prefix+"/lib64" -+def get_pluginpath(args): return destdir+prefix+"/lib64/yafray" ++def get_libpath(args): return destdir+prefix+"/lib" ++def get_pluginpath(args): return destdir+prefix+"/lib/yafray" +def get_binpath(args): return destdir+prefix+"/bin" +def get_confpath(args): return destdir+"/etc" def get_cxxflags(args): @@ -40,7 +40,7 @@ def get_include(args): return [ exr.PATH + "/include/OpenEXR" ] - def get_libpath(args): return [ exr.PATH + "/lib" ] -+ def get_libpath(args): return [ exr.PATH + "/lib64" ] ++ def get_libpath(args): return [ exr.PATH + "/lib" ] def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half'] class jpeg(globalinfo.library): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org