Couple of fixes

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

pocl.spec

@@ -1,7 +1,8 @@
+%global sover 1
 Summary:        Portable Computing Language - an OpenCL implementation
 Name:           pocl
 Version:        0.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 # The whole code is under MIT
 # except include/utlist.h which is under BSD (and unbundled) and
@@ -28,26 +29,12 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libEGL-devel
 BuildRequires:  ocl-icd-devel
-BuildRequires:  opencl-filesystem
-BuildRequires:  opencl-headers
 BuildRequires:  uthash-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libedit-devel
 BuildRequires:  glew-devel
 #BuildRequires:  vecmath-devel
 
-Requires:       clang%{?_isa}
-Requires:       opencl-filesystem
-Requires:       uthash-devel
-Requires:       libstdc++-devel%{?_isa}
-
-# libstdc++ from gcc is used
-# https://bugzilla.redhat.com/show_bug.cgi?id=1021645
-Requires:       gcc-c++%{?_isa}
-
-# Runtime dependency, because libm.so is required for kernels
-Requires:       glibc-devel%{?_isa}
-
 %description
 Pocl's goal is to become an efficient open source (MIT-licensed) implementation
 of the OpenCL 1.2 (and soon OpenCL 2.0) standard.
@@ -63,12 +50,16 @@ multiple work-items, even in the presence of work-group barriers. These
 functions are suitable for parallelization in multiple ways (SIMD, VLIW,
 superscalar,...).
 
-
 %package devel
 Summary:        Portable Computing Language development files
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       opencl-headers
-
+Requires:       ocl-icd-devel%{?_isa}
+Requires:       clang%{?_isa}
+Requires:       opencl-filesystem
+Requires:       uthash-devel
+Requires:       libstdc++-devel%{?_isa}
+# Runtime dependency, because libm.so is required for kernels
+Requires:       glibc-devel%{?_isa}
 
 %description devel
 Portable Computing Language development files.
@@ -104,6 +95,9 @@ popd
 #ln -vs %%{_includedir}/vecmath %%{buildroot}/%%{_libdir}/pocl/vecmath
 # <visit0r> but you need to run the .py to generate the files under the pocl dir
 
+# https://github.com/pocl/pocl/issues/369
+echo lib%{name}.so.%{sover} > %{buildroot}%{_sysconfdir}/OpenCL/vendors/%{name}.icd
+chmod +x %{buildroot}%{_bindir}/%{name}-standalone
 
 %check
 pushd build
@@ -121,22 +115,23 @@ popd
 
 %files
 %doc README doc/sphinx/source/*.rst
-%{_sysconfdir}/OpenCL/vendors/pocl.icd
-%{_bindir}/pocl-standalone
-%{_libdir}/libpocl.so.1*
-%{_libdir}/libpoclu.so.1*
-%{_libdir}/pocl/
-%{_datadir}/pocl/
-
+%{_sysconfdir}/OpenCL/vendors/%{name}.icd
+%{_libdir}/lib%{name}.so.%{sover}*
+%{_libdir}/lib%{name}u.so.%{sover}*
 
 %files devel
-%{_libdir}/libpoclu.so
-%{_libdir}/libpocl.so
-%{_libdir}/pkgconfig/pocl.pc
-%{_includedir}/poclu.h
-
+%{_bindir}/%{name}-standalone
+%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}u.so
+%{_libdir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/%{name}u.h
+%{_datadir}/%{name}/
 
 %changelog
+* Wed Aug 31 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.13-7
+- Couple of fixes
+
 * Wed Aug 31 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.13-6
 - Rebuild for OpenCL 2.1