diff --git a/ShellCheck.spec b/ShellCheck.spec index 03ff057..ecadd94 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -1,14 +1,15 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name ShellCheck %global pkgver %{pkg_name}-%{version} +# the tests hang %bcond_with tests Name: %{pkg_name} Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Shell script analysis tool License: GPLv3+ @@ -72,6 +73,7 @@ This package provides the Haskell %{name} library development files. %if %{with haddock} %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation +BuildArch: noarch %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -82,6 +84,7 @@ This package provides the Haskell %{name} library documentation. %package -n ghc-%{name}-prof Summary: Haskell %{name} profiling library Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (ghc-%{name}-devel and ghc-prof) %description -n ghc-%{name}-prof This package provides the Haskell %{name} profiling library. @@ -112,6 +115,16 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post -n ghc-%{name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{name}-devel +%ghc_pkg_recache +%endif + + %files # Begin cabal-rpm files: %license LICENSE @@ -133,6 +146,7 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %if %{with haddock} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%license LICENSE %endif @@ -142,6 +156,9 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %changelog +* Wed Feb 19 2020 Jens Petersen - 0.7.0-3 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild