Accepting request 535638 from home:pluskalm:branches:science

- We need clang4-devel-static to build with current clang packaging
- Small spec-file cleanup
  * drop conditionals for older releases then Factory as building
    was not possible anyways

OBS-URL: https://build.opensuse.org/request/show/535638
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=25

pocl.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Oct 21 06:28:35 UTC 2017 - mpluskal@suse.com
+
+- We need clang4-devel-static to build with current clang packaging
+- Small spec-file cleanup
+  * drop conditionals for older releases then Factory as building
+    was not possible anyways
+
 -------------------------------------------------------------------
 Wed Jul 12 10:50:47 UTC 2017 - jengelh@inai.de
 

pocl.spec

@@ -31,12 +31,8 @@ Url:            http://portablecl.org/
 Source0:        http://portablecl.org/downloads/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
 Patch0:         pocl-disable-tests.diff
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  clang4-devel
+BuildRequires:  clang4-devel-static
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl-devel
@@ -52,14 +48,12 @@ BuildRequires:  pkgconfig(hwloc)
 Requires:       clang4
 Requires:       libstdc++-devel
 Requires:       libut2
-%if 0%{?suse_version} > 1325
-Requires:       gcc
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # 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 armv7l armv7hl
+BuildRequires:  libboost_headers-devel
+Requires:       gcc
 
 %description
 Portable Computing Language (pocl) is an implementation of the OpenCL standard
@@ -112,7 +106,7 @@ This subpackage provides the development files needed for pocl.
 # FIXME - should be handled upstream
 mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir}
 mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot}%{_sysconfdir}
-sed -i 's|/usr/usr/|/usr/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
+sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
 
 # Unbundle vecmath
 #rm -vf %{buildroot}/%{_libdir}/pocl/vecmath/
@@ -127,7 +121,6 @@ sed -i 's|/usr/usr/|/usr/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc CHANGES README doc/sphinx/source/*.rst
 %dir %{_sysconfdir}/OpenCL/
 %dir %{_sysconfdir}/OpenCL/vendors
@@ -141,7 +134,6 @@ sed -i 's|/usr/usr/|/usr/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
 %{_datadir}/pocl/
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/libpoclu.so
 %{_libdir}/libpocl.so
 %{_libdir}/pkgconfig/pocl.pc