From 2126b9cdf6627ca2873a912d7a56fd71b3c591ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 25 Jul 2022 22:33:41 +0800 Subject: [PATCH] spdx is packaged in Fedora --- hadolint.spec | 20 +++++++++----------- sources | 1 - 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hadolint.spec b/hadolint.spec index ed3f3ae..7103c1a 100644 --- a/hadolint.spec +++ b/hadolint.spec @@ -6,17 +6,16 @@ %global monoidsubclasses monoid-subclasses-1.1.3 %global primes primes-0.2.1.0 -%global spdx spdx-1.0.0.3 %global timerep timerep-2.0.1.0 -%global subpkgs %{spdx} %{primes} %{monoidsubclasses} %{timerep} +%global subpkgs %{primes} %{monoidsubclasses} %{timerep} -# spdx needs older base-compat and tasty +# monoid-subclasses needs quickcheck-instances %bcond_with tests Name: %{pkg_name} Version: 2.8.0 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Dockerfile linter, validate inline bash License: GPLv3+ @@ -25,8 +24,7 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{monoidsubclasses}/%{monoidsubclasses}.tar.gz Source2: https://hackage.haskell.org/package/%{primes}/%{primes}.tar.gz -Source3: https://hackage.haskell.org/package/%{spdx}/%{spdx}.tar.gz -Source4: https://hackage.haskell.org/package/%{timerep}/%{timerep}.tar.gz +Source3: https://hackage.haskell.org/package/%{timerep}/%{timerep}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -57,7 +55,7 @@ BuildRequires: ghc-parallel-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-prettyprinter-prof BuildRequires: ghc-semver-prof -#BuildRequires: ghc-spdx-prof +BuildRequires: ghc-spdx-prof BuildRequires: ghc-split-prof BuildRequires: ghc-text-prof BuildRequires: ghc-time-prof @@ -70,8 +68,6 @@ BuildRequires: ghc-silently-devel %endif # for missing dep 'monoid-subclasses': BuildRequires: ghc-vector-prof -# for missing dep 'spdx': -BuildRequires: ghc-transformers-prof # for missing dep 'timerep': BuildRequires: ghc-attoparsec-prof # End cabal-rpm deps @@ -130,7 +126,6 @@ This package provides the Haskell %{name} profiling library. %if %{defined ghclibdir} %ghc_lib_subpackage %{monoidsubclasses} %ghc_lib_subpackage %{primes} -%ghc_lib_subpackage %{spdx} %ghc_lib_subpackage %{timerep} %endif @@ -139,7 +134,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 +%setup -q -a1 -a2 -a3 # End cabal-rpm setup cabal-tweak-flag static False @@ -197,6 +192,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Mon Jul 25 2022 Jens Petersen - 2.8.0-7 +- spdx is packaged in Fedora + * Thu Jul 21 2022 Fedora Release Engineering - 2.8.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b7e621f..58f91d6 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ SHA512 (hadolint-2.8.0.tar.gz) = b34f2c6b82e9b54c8deb2ef4833c3ff0ec8e1b68eb32fdec87ff7ac0816219c7dd7fad129af2d212874cfcfa32c97d5690ed8a01a4cc6ba835c0f460ba38ff34 SHA512 (monoid-subclasses-1.1.3.tar.gz) = bbb83d43f24ba87ab0894fa8488b3d1393d573d88f9a03b216de8164449c471d2eb41c9e811c1e014bdd6cc8f0582230788a07a926fad3030e24b304fc1cc79f SHA512 (primes-0.2.1.0.tar.gz) = 05ba4fd5de300782b0e38efab734a1e6544d96ed66ce3839ff0238e207d3e82a35174f476b1aea91fc0a981e9642ccaba81dd558da6012fc67f0b18a465c3e42 -SHA512 (spdx-1.0.0.3.tar.gz) = 16c7e3126d77b9284fc3ef27dd94e551cae5496595df32b47e08722ff03288766770a0ef17a69f0a70ebdead08c54cb385471351c8a33b60a3578fe2303c19ac SHA512 (timerep-2.0.1.0.tar.gz) = 58411e83b9c8a2e7357630a4cbb01ebcaf2e85bf44d7e1d9289b021a3274d920c6e81baa3e280c48b56fd75b4b90d12328c319c3f598e66474ce719da3746cf4