From 900c1f77127c8a27f52e970736fd1efa27e569e7 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Wed, 5 Feb 2014 00:06:25 +0100 Subject: [PATCH] bumped to version 0.3.1 Also added a workaround for the Fedora haskell toolchain (bug #1052117). --- .gitignore | 1 + ShellCheck.spec | 20 +++++++++++++------- d4bc0f6.diff | 21 --------------------- sources | 2 +- 4 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 d4bc0f6.diff diff --git a/.gitignore b/.gitignore index 9ad667f..7f3b6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /v0.2.0.tar.gz +/v0.3.1.tar.gz diff --git a/ShellCheck.spec b/ShellCheck.spec index 785464f..873a238 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -1,17 +1,14 @@ %global pkg_name ShellCheck Name: %{pkg_name} -Version: 0.2.0 -Release: 3%{?dist} +Version: 0.3.1 +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 -# https://github.com/koalaman/shellcheck/issues/44 -Patch0: https://github.com/koalaman/shellcheck/commit/d4bc0f6.diff - BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: @@ -60,7 +57,10 @@ This package provides the Haskell %{name} library development files. %prep %setup -q -n shellcheck-%{version} -%patch0 -p1 + +# workaround until the tarball root directory becomes %%{name}-%%{version} +# see also "cd %%{_builddir}/%%{name}-%%{version}" in other sections +ln -s shellcheck-%{version} ../%{name}-%{version} cat >Setup.hs < - 0.3.1-1 +- bumped to version 0.3.1 +- added a workaround for the Fedora haskell toolchain (bug #1052117) + * Tue Dec 03 2013 Dridi - 0.2.0-3 - rebuilt diff --git a/d4bc0f6.diff b/d4bc0f6.diff deleted file mode 100644 index e76da64..0000000 --- a/d4bc0f6.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/ShellCheck/Parser.hs b/ShellCheck/Parser.hs -index 94536ee..7013547 100644 ---- a/ShellCheck/Parser.hs -+++ b/ShellCheck/Parser.hs -@@ -1384,6 +1384,7 @@ prop_readForClause5 = isOk readForClause "for ((i=0;i<10 && n>x;i++,--n))\ndo \n - prop_readForClause6 = isOk readForClause "for ((;;))\ndo echo $i\ndone" - prop_readForClause7 = isOk readForClause "for ((;;)) do echo $i\ndone" - prop_readForClause8 = isOk readForClause "for ((;;)) ; do echo $i\ndone" -+prop_readForClause9 = isOk readForClause "for i do true; done" - readForClause = called "for loop" $ do - pos <- getPosition - (T_For id) <- g_For -@@ -1408,7 +1409,7 @@ readForClause = called "for loop" $ do - readRegular = do - name <- readVariableName - spacing -- values <- readInClause <|> (readSequentialSep >> return []) -+ values <- readInClause <|> (optional readSequentialSep >> return []) - return $ \id group -> (return $ T_ForIn id name values group) - - prop_readSelectClause1 = isOk readSelectClause "select foo in *; do echo $foo; done" diff --git a/sources b/sources index 8049760..c971a21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb938bca816e2ccc75c31f44adde1f9d v0.2.0.tar.gz +4cfd04250ec28485ae54055ba081e6fa v0.3.1.tar.gz