[pocl/f19: 5/5] Update to 0.9rc2

[Fabian Deutsch]

commit 2766835439d10c0ad7e255d52ead9bb2077c04c5
Author: Fabian Deutsch <fabiand at fedoraproject.org>
Date:   Fri Jan 17 13:10:53 2014 +0100

    Update to 0.9rc2
    
    Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>

 pocl.spec |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/pocl.spec b/pocl.spec
index c671555..0c443c4 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -1,19 +1,28 @@
-%global commit 9374f3248b5990bcd3aad088f1f98604e5f54bb0
+
+# If it's a released tarball, provide the source here
+%global source http://downloads.sourceforge.net/project/pocl/pocl-0.9-RC2.tar.gz
+
+%global is_release %{?source:1}%{!?source:0}
+
+%if !%{?is_release}
+%global commit fc4565b95d5ef90f1f3b634054d8892b193344e2
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20131209
+%global commitdate 20140117
 %global gitversion .git%{commitdate}.%{shortcommit}
+%global source https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+%endif
 
 Summary:	Portable Computing Language - an OpenCL implementation
 Name:		pocl
 Version:	0.9
-Release:	0.8%{?gitversion}%{?dist}
+Release:	0.9.rc2%{?gitversion}%{?dist}
 
 # The whole code is under MIT
 # except include/utlist.h which is under BSD (and unbundled) and
 # except lib/kernel/vecmath which is under GPLv3+ or LGPLv3+ (and unbundled in future)
 License:	MIT and BSD and (GPLv3+ or LGPLv3+)
 URL:		http://pocl.sourceforge.net
-Source0:	https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:        %{?source}
 
 # Only armv7l is supported
 # PPC support is currently broken, due to path problems
@@ -68,7 +77,11 @@ Portable Computing Lanugage development files
 
 
 %prep
-%setup -qn %{name}-%{commit}
+%if %{?is_release}
+%setup -q
+%else
+%setup -qn %{name}-%{?commit}
+%endif
 
 # Unbundle uthash
 find . -depth -name utlist* | xargs rm -f
@@ -81,7 +94,12 @@ autoreconf -fiv
 # Somehow clang is not aware of common marches like pentium-m
 # Setting it to (unknown) tells pocl to not add -march
 # https://github.com/pocl/pocl/issues/29
-export LLC_HOST_CPU="(unknown)"
+%ifarch %{ix86}
+export LLC_HOST_CPU="pentium-m"
+%endif
+%ifarch x86_64
+export LLC_HOST_CPU="x86-64"
+%endif
 
 # Disable-llvmapi because using llvmapi does currently not build
 %configure --disable-static \
@@ -97,10 +115,6 @@ make %{?_smp_mflags}
 # NOTE: We intentionally don't ship *.la files
 find %{buildroot} -type f -name '*.la' | xargs rm -f -- || :
 
-# Unbundle utlist.h
-rm -vf %{buildroot}/%{_includedir}/pocl/utlist.h
-ln -vs %{_includedir}/utlist.h %{buildroot}/%{_includedir}/pocl/utlist.h
-
 # Unbundle vecmath
 #rm -vf %{buildroot}/%{_libdir}/pocl/vecmath/
 #ln -vs %{_includedir}/vecmath %{buildroot}/%{_libdir}/pocl/vecmath
@@ -125,8 +139,6 @@ make check
 %{_libdir}/libpoclu.so.1
 %{_libdir}/pocl/
 %{_datadir}/pocl/
-# Is required at runtime to build kernels
-%{_includedir}/pocl/
 
 
 %files devel
@@ -137,6 +149,9 @@ make check
 
 
 %changelog
+* Fri Jan 17 2014 Fabian Deutsch <fabiand at fedoraproject.org> - 0.9-0.9.rc2
+- Update to 0.9RC2
+
 * Wed Jan 15 2014 Dave Airlie <airlied at redhat.com> 0.9-0.8.git20131209.9374f32
 - bump for rebuild against llvm 3.4