[pocl/f20] update to recent git-snapshot minor cleanup include some more documentation

Björn Esser besser82 at fedoraproject.org
Tue Oct 1 16:05:10 UTC 2013


commit 530ce3e8c0fc07db6c5ec7587f4776196ee03b2c
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Tue Oct 1 18:04:08 2013 +0200

    update to recent git-snapshot
    minor cleanup
    include some more documentation

 .gitignore |    5 +++-
 pocl.spec  |   70 +++++++++++++++++++++++++++++++++++------------------------
 sources    |    2 +-
 3 files changed, 46 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index efe8fe6..4a406bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/pocl-0.8.tar.gz
+*~
+*.rpm
+*.tar*
+results_*/
diff --git a/pocl.spec b/pocl.spec
index 71b6fc8..ca7327d 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -1,32 +1,40 @@
+%global commit b1907401bad4b00ecbdd55bc60b1525e88ec928b
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20130925
+%global gitversion .git%{commitdate}.%{shortcommit}
+
+Summary:	Portable Computing Language
+Name:		pocl
+Version:	0.9
+Release:	0.1%{?gitversion}%{?dist}
 
-Summary:  Portable Computing Language
-Name:     pocl
-Version:  0.8
-Release:  8%{?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+)
-Group:    System Environment/Libraries
-URL:      http://pocl.sourceforge.net
-Source0:  http://pocl.sourceforge.net/downloads/pocl-%{version}.tar.gz
+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
 
 # Only armv7l is supported
 # PPC support is currently broken, due to path problems
 # s390(x) and aarch64 also not supported, so use ExclusiveArch
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch:	%{ix86} x86_64
 
-BuildRequires: pkgconfig automake autoconf libtool libtool-ltdl-devel
-BuildRequires: opencl-filesystem opencl-headers ocl-icd-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: llvm-devel clang
-BuildRequires: hwloc-devel
-BuildRequires: uthash-devel
-#BuildRequires: vecmath-devel
+BuildRequires:	clang
+BuildRequires:	hwloc-devel
+BuildRequires:	libtool
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	llvm-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	ocl-icd-devel
+BuildRequires:	opencl-filesystem
+BuildRequires:	opencl-headers
+BuildRequires:	uthash-devel
+#BuildRequires:	vecmath-devel
 
-Requires: opencl-filesystem
-Requires: clang
-Requires: uthash
+Requires:	clang
+Requires:	opencl-filesystem
+Requires:	uthash
 
 
 %description
@@ -46,11 +54,9 @@ superscalar,...).
 
 
 %package devel
-Summary:  Portable Computing Lanugage development files
-Group:    Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
-Requires: opencl-headers
+Summary:	Portable Computing Lanugage development files
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	opencl-headers
 
 
 %description devel
@@ -58,13 +64,14 @@ Portable Computing Lanugage development files
 
 
 %prep
-%setup -q
+%setup -qn %{name}-%{commit}
 
 # Unbundle uthash
 find . -depth -name utlist* | xargs rm -f
 
 
 %build
+autoreconf -fiv
 %configure --disable-static \
            --enable-icd \
            --enable-tests-with-icd=default
@@ -72,7 +79,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 # NOTE: We intentionally don't ship *.la files
 find %{buildroot} -type f -name '*.la' | xargs rm -f -- || :
@@ -96,12 +103,12 @@ make check
 
 
 %files
-%doc README
+%doc README doc/sphinx/source/*.rst
 %{_sysconfdir}/OpenCL/vendors/pocl.icd
 %{_bindir}/pocl-standalone
-%{_libdir}/libpocl.so.1.1.0
+%{_libdir}/libpocl.so.1.2.0
 %{_libdir}/libpocl.so.1
-%{_libdir}/libpoclu.so.1.1.0
+%{_libdir}/libpoclu.so.1.2.0
 %{_libdir}/libpoclu.so.1
 %{_libdir}/pocl/
 %{_datadir}/pocl/
@@ -117,6 +124,11 @@ make check
 
 
 %changelog
+* Tue Oct 01 2013 Björn Esser <bjoern.esser at gmail.com> - 0.9-0.1.git20130925.b190740
+- update to recent git-snapshot
+- minor cleanup
+- include some more documentation
+
 * Sun Sep 29 2013 Dan Horák <dan[at]danny.cz> - 0.8-8
 - switch to ExclusiveArch as it needs explicit porting to new arches
 
diff --git a/sources b/sources
index 8260ed6..b1bea65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1807335abd66537e6cd5bc3c465e68df  pocl-0.8.tar.gz
+9e7ad53c9f7fd9e032a60030051a268e  pocl-0.9-b190740.tar.gz


More information about the scm-commits mailing list