diff --git a/.gitignore b/.gitignore index 41ac63f..1fc78cf 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /prjtrellis-5e51529.tar.gz /prjtrellis-35f5aff.tar.gz /prjtrellis-0c522ce.tar.gz +/prjtrellis-f767e56.tar.gz diff --git a/sources b/sources index fb607ac..e3f6bf0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (prjtrellis-0c522ce.tar.gz) = 7656b2599bf5df3d52cb047c2fedbcfe00d3b1e1c032c4383eb6a8f54b810a979011bfcaa22bf14f75fb2d595d9eb6502fe54bc330330c7c6adca6b2c6137932 SHA512 (prjtrellis-db-35d900a.tar.gz) = 21e3a6ea386af610fdff4124151ebe98cb0ad75be641b641fa1f52ef0fd521feb289628d156cdcf69e209fdcdb9c65aeb3226128dd652c8ae3fb2cb7f3aa4389 +SHA512 (prjtrellis-f767e56.tar.gz) = 218154d5d5d91d659ebda77699795fd4afee32d139336223525d756af6197133d83951c0959018101b29aadd95519ac1a98166133edaf68210d819cc1467203b diff --git a/trellis.spec b/trellis.spec index ce8e988..adba59a 100644 --- a/trellis.spec +++ b/trellis.spec @@ -1,16 +1,16 @@ -%global commit0 0c522ce818010f6597dd7001d3123ff38c365e50 +%global commit0 f767e56e06c94692df6cfcab56f2af222a7d85b9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global commit1 35d900a94ff0db152679a67bf6e4fbf40ebc34aa %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global snapdate 20230215 +%global snapdate 20230226 %global __python %{__python3} Name: trellis Version: 1.2.1 -Release: 14.%{snapdate}git%{shortcommit0}%{?dist} +Release: 16.%{snapdate}git%{shortcommit0}%{?dist} Summary: Lattice ECP5 FPGA bitstream creation/analysis/programming tools License: ISC URL: https://github.com/YosysHQ/prj%{name} @@ -22,7 +22,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: python3-devel BuildRequires: boost-python3-devel -BuildRequires: pybind11-devel +#BuildRequires: pybind11-devel # for building docs: BuildRequires: python3-sphinx-latex BuildRequires: python3-recommonmark @@ -73,8 +73,8 @@ find . -name \.gitignore -delete # disable LTO to allow building for f33 rawhide (BZ 1865586): %define _lto_cflags %{nil} %cmake libtrellis \ - -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ -DCURRENT_GIT_VERSION=%{version}-%{release} +# -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ %cmake_build %make_build -C docs latexpdf # build manpages: @@ -117,6 +117,13 @@ install -Dpm644 -t %{buildroot}%{_mandir}/man1 man1/* %{_datadir}/%{name}/database %changelog +* Sun Feb 26 2023 Gabriel Somlo - 1.2.1-16.20230226gitf767e56 +- Update to newer snapshot +- Temp. use bundled pybind11 (https://github.com/pybind/pybind11/issues/4529) + +* Mon Feb 20 2023 Jonathan Wakely - 1.2.1-15.20230215git0c522ce +- Rebuilt for Boost 1.81 + * Wed Feb 15 2023 Gabriel Somlo - 1.2.1-14.20230215git0c522ce - Update to newer snapshot