From cafe16d3e29d0cd2ffdce65801e041f45b3e4d16 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Thu, 4 Sep 2014 11:19:26 +0200 Subject: [PATCH] bumped to version 0.3.4 --- ShellCheck.spec | 36 ++++++++++++++++-------------------- sources | 2 +- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ShellCheck.spec b/ShellCheck.spec index 523eb8c..1821cd9 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -1,24 +1,27 @@ %global pkg_name ShellCheck +%global with_tests 1 Name: %{pkg_name} -Version: 0.3.3 -Release: 2%{?dist} +Version: 0.3.4 +Release: 1%{?dist} Summary: Tool for checking common errors in POSIX shell scripts License: AGPLv3+ URL: http://www.shellcheck.net/about.html -Source0: https://github.com/koalaman/shellcheck/archive/v%{version}.tar.gz +Source0: http://hackage.haskell.org/package/ShellCheck-%{version}/ShellCheck-%{version}.tar.gz 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 BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-regex-compat-devel +BuildRequires: ghc-transformers-devel # End cabal-rpm deps BuildRequires: pandoc @@ -56,18 +59,14 @@ This package provides the Haskell %{name} library development files. %prep -%autosetup -n shellcheck-%{version} -p 1 - -# workaround until the tarball root directory becomes %%{name}-%%{version} -if [ ! -d ../%{name}-%{version} ]; then - ln -s shellcheck-%{version} ../%{name}-%{version} -fi +%setup -q %build +LANG=en_US.utf8 %ghc_lib_build -make shellcheck.1 +pandoc -s -t man shellcheck.1.md -o $@ shellcheck.1 %install @@ -75,19 +74,11 @@ make shellcheck.1 install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 -## modify: -#%%ghc_fix_dynamic_rpath shellcheck -# since shellcheck-%{version}/ != %{pkg_name}-%{version}/ -%if %{undefined ghc_without_dynamic} -PDIR=$(cd ..; pwd) -PROG=%{buildroot}%{_bindir}/shellcheck -NEWRPATH=$(chrpath $PROG | sed -e "s@^$PROG: RPATH=@@" | sed -e "s@$PDIR/shellcheck@%{ghclibdir}/%{pkg_name}@" -e "s@/dist/build@@g") -chrpath -r $NEWRPATH $PROG -%endif +%ghc_fix_dynamic_rpath shellcheck %check -make .tests +%cabal test %post -n ghc-%{name} @@ -122,6 +113,11 @@ make .tests %changelog +* Thu Sep 11 2014 Dridi - 0.3.4-1 +- bumped to version 0.3.4 +- switched to hackage for the source tarball +- tests are now driven by cabal + * Fri Sep 5 2014 Jens Petersen - 0.3.3-2 - reenable pandoc on ARM diff --git a/sources b/sources index f60e46c..af31e06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed06fea3b4742399f8d6a2db361fc79b v0.3.3.tar.gz +f69a49b67d054502da594e4ab151d626 ShellCheck-0.3.4.tar.gz