1 files changed, 11 insertions, 16 deletions
diff --git a/0.84/platform/olpcsound/SPECS/olpcsound.spec b/0.84/platform/olpcsound/SPECS/olpcsound.spec
index 69250d3..64df565 100644
--- a/0.84/platform/olpcsound/SPECS/olpcsound.spec
+++ b/0.84/platform/olpcsound/SPECS/olpcsound.spec
@@ -1,16 +1,11 @@
 # NOTE: Do not edit, file was generated by jhconvert
 
-%define libname %{name}
+%define libname lib%{name}
 %define pyname python-%{name}
 
 Name: olpcsound
 Version: 5.10.1
-%if 0%{?suse_version}
 Release: 1
-%else
-Release: %mkrel 2
-%endif
-
 Summary: Csound - sound synthesis language and library, OLPC subset
 License: LGPLv2+
 Group: Sound
@@ -21,10 +16,11 @@ Source: http://downloads.sourceforge.net/csound/Csound5.10.1.tar.gz
 Patch: olpcsound-5.10.1-gentoo-proaudio-csound-SConsruct.patch
 Patch1: olpcsound-5.10.1-sugar-csound-64bit.patch
 Patch2: olpcsound-5.10.1-sugar-csound-bad-symbols.patch
+Patch3: olpcsound-5.10.1-sugar-csound-python-version.patch
 
 
 BuildRequires: alsa-devel  
-BuildRequires: gettext-runtime  
+BuildRequires: gettext  
 BuildRequires: liblo-devel  
 BuildRequires: libogg-devel  
 BuildRequires: libpng-devel  
@@ -33,7 +29,10 @@ BuildRequires: libvorbis-devel
 BuildRequires: python-devel  
 BuildRequires: scons  
 BuildRequires: swig  
-BuildPreReq: gcc-c++
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Olpcsound is a subset of the Csound sound and music synthesis system,
@@ -71,6 +70,7 @@ tailored specifically for XO platform.
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %ifarch x86_64
 %global x86_64_flags Word64=1 Lib64=1
@@ -99,11 +99,6 @@ python  \
 	--install-headers \
 	--instdir=%{buildroot} \
 	--libdir=%{_libdir}
-%ifarch x86_64
-mkdir -p %{buildroot}/%{python_sitelib}
-mv %{buildroot}/%{_libdir}/python*/site-packages/* 
-%{buildroot}/%{python_sitelib}/
-%endif
 %find_lang csound5
 
 %clean
@@ -127,7 +122,7 @@ rm -rf %{buildroot}
 
 %files -n %{pyname}
 %defattr(-,root,root,-)
-%{python_sitelib}/*
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+
+%changelog
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig