update to recent git-snapshot
general cleanup, squashed unneeded BuildRequires cleanup the %%doc mess. add %%check for running the testsuite
This commit is contained in:
Björn Esser
parent
f079dfd959
commit
699f56c01a
5
.gitignore
vendored
5
.gitignore
vendored
@ -1 +1,4 @@
|
||||
/ocl-icd-20130309.tar.bz2
|
||||
*~
|
||||
*.rpm
|
||||
*.tar*
|
||||
results_*/
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 87f58d74a589d78ec3949dbfe92411aaa8010b42 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Clark <robdclark@gmail.com>
|
||||
Date: Thu, 7 Mar 2013 14:55:28 -0500
|
||||
Subject: [PATCH 1/2] build: add missing AM_PROG_AR
|
||||
|
||||
fixes:
|
||||
|
||||
automake: warnings are treated as errors
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libOpenCL.la':
|
||||
linking libtool libraries using a non-POSIX
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR'
|
||||
in 'configure.ac'
|
||||
Makefile.am:17: while processing Libtool library 'libOpenCL.la'
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: warning:
|
||||
'libdummycl-noext.la': linking libtool libraries using a non-POSIX
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR'
|
||||
in 'configure.ac'
|
||||
Makefile.am:93: while processing Libtool library 'libdummycl-noext.la'
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libdummycl.la':
|
||||
linking libtool libraries using a non-POSIX
|
||||
/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR'
|
||||
in 'configure.ac'
|
||||
Makefile.am:93: while processing Libtool library 'libdummycl.la'
|
||||
Makefile.am:103: warning: compiling 'run_dummy_icd.c' with per-target
|
||||
flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
|
||||
Makefile.am: installing 'build-aux/depcomp'
|
||||
---
|
||||
configure.ac | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3439fd5..49b3ed1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -19,6 +19,7 @@ AC_SUBST([OPENCL_VERSION])
|
||||
AC_PROG_CC_C89
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
+AM_PROG_AR
|
||||
|
||||
AC_PATH_PROG([ASCIIDOC], [asciidoc], [])
|
||||
AC_PATH_PROG([A2X], [a2x], [])
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From b95616f2be2de27340e0dafc687b4b44eafb5587 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Clark <robdclark@gmail.com>
|
||||
Date: Thu, 7 Mar 2013 14:56:34 -0500
|
||||
Subject: [PATCH 2/2] build: add missing AM_PROG_CC_C_O
|
||||
|
||||
Makefile.am:103: warning: compiling 'run_dummy_icd.c' with per-target
|
||||
flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
|
||||
autoreconf: automake failed with exit status: 1
|
||||
---
|
||||
configure.ac | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 49b3ed1..e130ad4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -17,6 +17,7 @@ AC_SUBST([OPENCL_VERSION])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC_C89
|
||||
+AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AM_PROG_AR
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
80
ocl-icd.spec
80
ocl-icd.spec
@ -1,67 +1,75 @@
|
||||
%global gitdate 20130309
|
||||
%global commit 4ee231e3c0145173e865d2594b93b232e8faab6c
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commitdate 20131001
|
||||
%global gitversion .git%{commitdate}.%{shortcommit}
|
||||
|
||||
Summary: OpenCL ICD Bindings
|
||||
Name: ocl-icd
|
||||
Version: 2.0.2
|
||||
Release: 3%{?dist}
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
URL: http://forge.imag.fr/projects/ocl-icd/
|
||||
Source0: %{name}-%{gitdate}.tar.bz2
|
||||
Name: ocl-icd
|
||||
Version: 2.0.4
|
||||
Release: 1%{?gitversion}%{?dist}
|
||||
Summary: OpenCL ICD Bindings
|
||||
|
||||
BuildRequires: pkgconfig automake autoconf libtool
|
||||
BuildRequires: ruby opencl-headers
|
||||
License: BSD
|
||||
URL: http://%{name}.forge.imag.fr/
|
||||
Source0: https://forge.imag.fr/plugins/scmgit/cgi-bin/gitweb.cgi?p=%{name}/%{name}.git;a=snapshot;h=%{commit};sf=tgz#/%{name}-%{version}-%{shortcommit}.tar.gz
|
||||
|
||||
Patch1: 0001-build-add-missing-AM_PROG_AR.patch
|
||||
Patch2: 0002-build-add-missing-AM_PROG_CC_C_O.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: opencl-headers
|
||||
BuildRequires: ruby
|
||||
|
||||
%description
|
||||
OpenCL ICD Bindings
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: OpenCL ICD Bindings package
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Summary: Development files for OpenCL ICD Bindings
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
OpenCL ICD Bindings development package
|
||||
This package contains the development files for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q %{?gitdate:-n %{name}-%{gitdate}}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%setup -qn %{name}-master-%{shortcommit}
|
||||
|
||||
|
||||
%build
|
||||
autoreconf -ivf || exit 1
|
||||
autoreconf -fiv
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# NOTE: We intentionally don't ship *.la files
|
||||
find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name '*.la' -print0 | xargs -0 rm -rf
|
||||
rm -rf %{buildroot}/%{_defaultdocdir}
|
||||
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%doc README COPYING
|
||||
%{_libdir}/libOpenCL.so.1
|
||||
%{_libdir}/libOpenCL.so.1.0.0
|
||||
%doc COPYING NEWS README
|
||||
%{_libdir}/libOpenCL.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/ocl_icd.h
|
||||
%{_libdir}/pkgconfig/ocl-icd.pc
|
||||
%{_libdir}/pkgconfig/OpenCL.pc
|
||||
%doc ocl_icd_loader.map ocl_icd_bindings.c
|
||||
%{_includedir}/*
|
||||
%{_libdir}/libOpenCL.so
|
||||
%dir %{_datadir}/doc/ocl-icd
|
||||
%dir %{_datadir}/doc/ocl-icd/examples
|
||||
%{_datadir}/doc/ocl-icd/examples/ocl_icd_bindings.c
|
||||
%{_datadir}/doc/ocl-icd/examples/ocl_icd_loader.map
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 01 2013 Björn Esser <bjoern.esser@gmail.com> - 2.0.4-1.git20131001.4ee231e
|
||||
- update to recent git-snapshot
|
||||
- general cleanup, squashed unneeded BuildRequires
|
||||
- cleanup the %%doc mess.
|
||||
- add %%check for running the testsuite
|
||||
|
||||
* Wed Aug 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-3
|
||||
- Specfile cleanup
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user