From 5284ad0f4efb993b46544c1dd4b80a5f4257c28e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 7 Mar 2016 18:02:56 +0900 Subject: [PATCH] update to 0.3.8 --- .gitignore | 1 + ShellCheck.spec | 40 +++++++++++++--------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 3783090..a695583 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /ShellCheck-0.3.4.tar.gz /ShellCheck-0.3.5.tar.gz /ShellCheck-0.3.7.tar.gz +/ShellCheck-0.3.8.tar.gz diff --git a/ShellCheck.spec b/ShellCheck.spec index ea8c3e8..8629739 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -2,34 +2,22 @@ %global pkg_name ShellCheck -# re-enable after QuickCheck code moved out of main src files -# (see https://github.com/koalaman/shellcheck/issues/254) -#%%ifarch %(echo %%{ghc_arches_with_ghci} | sed -e s/armv7hl//) -#%%bcond_without tests -#%%else -#%%bcond_with tests -#%%endif - -# disable all tests for now to avoid linking QuickCheck -%bcond_with tests - -# disable profiling symbols -%global without_prof 1 +%bcond_without tests Name: %{pkg_name} -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Shell script analysis tool -License: AGPLv3+ -URL: http://www.shellcheck.net/about.html +License: GPLv3+ +Url: https://github.com/koalaman/shellcheck Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch0: ShellCheck-disable-TemplateHaskell-runTests.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-json-devel @@ -37,9 +25,6 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-regex-tdfa-devel BuildRequires: ghc-transformers-devel -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -%endif # End cabal-rpm deps BuildRequires: pandoc @@ -77,13 +62,9 @@ This package provides the Haskell %{name} library development files. %prep %setup -q -%if %{without tests} -%patch0 -p1 -b .orig -%endif %build -LANG=en_US.utf8 %ghc_lib_build pandoc -s -t man shellcheck.1.md -o shellcheck.1 @@ -96,6 +77,8 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %ghc_fix_dynamic_rpath shellcheck +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -112,14 +95,14 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %files -%doc LICENSE +%license LICENSE %doc README.md %{_bindir}/shellcheck %{_mandir}/man1/shellcheck.1* %files -n ghc-%{name} -f ghc-%{name}.files -%doc LICENSE +%license LICENSE %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files @@ -127,6 +110,9 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %changelog +* Mon Mar 7 2016 Jens Petersen - 0.3.8-1 +- update to 0.3.8 + * Wed Feb 03 2016 Fedora Release Engineering - 0.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 63f27ed..7207b70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e570545d9168e085c465e0fd8902340 ShellCheck-0.3.7.tar.gz +af85af7c1bf4044eafa19ba7edf10061 ShellCheck-0.3.8.tar.gz