From d87ffe157a23446f87fe39058a66199cb4ee2997 Mon Sep 17 00:00:00 2001 From: Gabriel Somlo Date: May 17 2020 14:38:38 +0000 Subject: update to newer snapshot --- diff --git a/.gitignore b/.gitignore index e99090c..f2c3fde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /icestorm-5c4d4db.tar.gz /icestorm-fa1c932.tar.gz /icestorm-9594931.tar.gz +/icestorm-cd2610e.tar.gz diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 0ec551f..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/icetime/icetime.cc b/icetime/icetime.cc ---- a/icetime/icetime.cc 2019-08-15 05:31:53.000000000 -0600 -+++ b/icetime/icetime.cc 2019-09-23 17:04:50.288801484 -0600 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #ifdef __EMSCRIPTEN__ - #include diff --git a/icestorm.spec b/icestorm.spec index 3892abd..b66216c 100644 --- a/icestorm.spec +++ b/icestorm.spec @@ -1,13 +1,13 @@ -%global commit0 95949315364f8d9b0c693386aefadf44b28e2cf6 +%global commit0 cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global snapdate 20190823 +%global snapdate 20200517 %global __python %{__python3} Name: icestorm Version: 0 -Release: 0.11.%{snapdate}git%{shortcommit0}%{?dist} +Release: 0.12.%{snapdate}git%{shortcommit0}%{?dist} Summary: Lattice iCE40 FPGA bitstream creation/analysis/programming tools License: ISC URL: http://www.clifford.at/%{name}/ @@ -15,7 +15,6 @@ Source0: https://github.com/cliffordwolf/%{name}/archive/%{commit0}/%{nam # Fedora-specific patch for datadir Patch1: %{name}-datadir.patch -Patch2: gcc10.patch BuildRequires: gcc-c++ BuildRequires: python%{python3_pkgversion} libftdi-devel @@ -27,7 +26,6 @@ FPGAs and providing simple tools for analyzing and creating bitstream files. %prep %setup -q -n %{name}-%{commit0} %patch1 -p1 -b .datadir -%patch2 -p1 -b .gcc10 # fix shebang lines in Python scripts find . -name \*.py -exec sed -i 's|/usr/bin/env python3|/usr/bin/python3|' {} \; @@ -61,6 +59,10 @@ install -pm644 icefuzz/timings_*.txt %{buildroot}%{_datarootdir}/%{name} %{_datarootdir}/%{name} %changelog +* Sun May 17 2020 Gabriel Somlo - 0-0.12.20200517gitcd2610e +- Update to newer snapshot +- Spec file: remove gcc10 patch (now in upstream) + * Wed Jan 29 2020 Fedora Release Engineering - 0-0.11.20190823git9594931 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8a07f4e..37eddf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (icestorm-9594931.tar.gz) = 6bce46f779d3c456b87d7f9468127590e4b474fd2c14782355a9c45298d8c2999eb78c1a6a38da0ea2a8bfe39be06882f793bf7d5baeca85ae40bb6c05b71423 +SHA512 (icestorm-cd2610e.tar.gz) = c15370f12b8b787ff00690d031198643bc2810f51a21316760a795ab3f3cc0f8e57123c458ca8c5b6e3941c2dc8cf65204f1c0c27fdb10c1b07f71d96a48b93b