diff --git a/.gitignore b/.gitignore index 18aa799..17b99e3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /embree-3.0.0-beta.0.tar.gz /embree-3.0.0.tar.gz /embree-3.0.0-40b9aca.tar.gz +/embree-3.1.0.tar.gz +/embree-3.2.0.tar.gz diff --git a/embree.spec b/embree.spec index d802382..3002af0 100644 --- a/embree.spec +++ b/embree.spec @@ -1,16 +1,18 @@ %global with_prerelease 0 -%global with_snapshot 1 +%global with_snapshot 0 %global prerelease beta %global commit 40b9aca2668f443cae6bfbfa7cc5a354f1087011 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: embree -Version: 3.0.0 +Version: 3.2.0 %if %{with_prerelease} -Release: 0.1.%{prerelease}%{?dist} -%else %if %{with_snapshot} +%if %{with_snapshot} Release: 1.%{shortcommit}git%{?dist} %else +Release: 0.1.%{prerelease}%{?dist} +%endif +%else Release: 1%{?dist} %endif Summary: Collection of high-performance ray tracing kernels developed at Intel @@ -18,10 +20,12 @@ Summary: Collection of high-performance ray tracing kernels developed at Intel License: ASL 2.0 URL: https://embree.github.io %if %{with_prerelease} -Source: https://github.com/%{name}/%{name}/archive/v%{version}-%{prerelease}.0.tar.gz#/%{name}-%{version}-%{prerelease}.0.tar.gz -%else %if %{with_snapshot} +%if %{with_snapshot} Source: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz#/%{name}-%{version}-%{shortcommit}.tar.gz %else +Source: https://github.com/%{name}/%{name}/archive/v%{version}-%{prerelease}.0.tar.gz#/%{name}-%{version}-%{prerelease}.0.tar.gz +%endif +%else Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz %endif @@ -30,6 +34,7 @@ BuildRequires: cmake BuildRequires: make BuildRequires: ispc BuildRequires: freeglut-devel +BuildRequires: glfw-devel BuildRequires: ImageMagick-c++-devel BuildRequires: libXmu-devel,libXi-devel BuildRequires: tbb-devel @@ -58,9 +63,11 @@ The %{name}-examples package contains sample binaries using %{name}. %prep %if %{with_prerelease} -%autosetup -n %{name}-%{version}-%{prerelease}.0 -%else %if %{with_prerelease} +%if %{with_snapshot} %autosetup -n %{name}-%{commit} +%else +%autosetup -n %{name}-%{version}-%{prerelease}.0 +%endif %else %autosetup -n %{name}-%{version} %endif @@ -112,6 +119,13 @@ ctest -V %{?_smp_mflags} %changelog +* Sat Jun 02 2018 Luya Tshimbalanga - 3.2.0-1 +- Update to 3.2.0 +- Add glfw dependency + +* Thu Apr 19 2018 Luya Tshimbalanga - 3.1.0-1 +- Update to 3.1.0 + * Mon Mar 19 2018 Luya Tshimbalanga - 3.0.0-1.40b9acagit - Upstream snapshot compile fix for gcc 8 - Optimize spec file diff --git a/sources b/sources index a159cfd..089177d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (embree-3.0.0-40b9aca.tar.gz) = fcf990738433ee469c2e32f4fb055e84132ca6240a42db047d90bdb563d4753d1eeda4a0b5dd03d662a83244cbf4614cf0292e16a90925ec82843aac7abc8302 +SHA512 (embree-3.2.0.tar.gz) = 296617251e4a9a95a5ceec10ce8f23daf180a8a61fd78bc5782dca7d5b15bddaa0b6f352e47d657a366ef9176a730ef2edc42451fbad8071c5ce8fbfb4515e51