From 1bdcf5f81927197a3f3913976527f6b43fa140f1 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Sat, 1 Mar 2014 18:34:20 +0100 Subject: [PATCH] executable dynamically linked to the library --- 105.diff | 45 +++++++++++++++++++++++++++++++++++++++++++++ ShellCheck.spec | 8 ++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 105.diff diff --git a/105.diff b/105.diff new file mode 100644 index 0000000..d950466 --- /dev/null +++ b/105.diff @@ -0,0 +1,45 @@ +diff --git a/ShellCheck.cabal b/ShellCheck.cabal +index ba622df..b4465a6 100644 +--- a/ShellCheck.cabal ++++ b/ShellCheck.cabal +@@ -9,7 +9,7 @@ Author: Vidar Holen + Maintainer: vidar@vidarholen.net + Homepage: http://www.shellcheck.net/ + Build-Type: Simple +-Cabal-Version: >= 1.6 ++Cabal-Version: >= 1.8 + Bug-reports: https://github.com/koalaman/shellcheck/issues + Description: + The goals of ShellCheck are: +@@ -28,8 +28,29 @@ source-repository head + location: git://github.com/koalaman/shellcheck.git + + library +- build-depends: base >= 4, base < 5, parsec, containers, regex-compat, mtl, directory, json +- exposed-modules: ShellCheck.AST, ShellCheck.Data, ShellCheck.Parser, ShellCheck.Analytics, ShellCheck.Simple ++ build-depends: ++ base >= 4 && < 5, ++ containers, ++ directory, ++ json, ++ mtl, ++ parsec, ++ regex-compat ++ exposed-modules: ++ ShellCheck.Analytics ++ ShellCheck.AST ++ ShellCheck.Data ++ ShellCheck.Parser ++ ShellCheck.Simple + + executable shellcheck ++ build-depends: ++ ShellCheck, ++ base >= 4 && < 5, ++ containers, ++ directory, ++ json, ++ mtl, ++ parsec, ++ regex-compat + main-is: shellcheck.hs diff --git a/ShellCheck.spec b/ShellCheck.spec index 7870dbb..c1af886 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -2,12 +2,13 @@ Name: %{pkg_name} Version: 0.3.1 -Release: 3%{?dist} +Release: 4%{?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 +Patch0: https://github.com/koalaman/shellcheck/pull/105.diff BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -61,7 +62,7 @@ This package provides the Haskell %{name} library development files. %prep -%setup -q -n shellcheck-%{version} +%autosetup -n shellcheck-%{version} -p 1 # workaround until the tarball root directory becomes %%{name}-%%{version} ln -s shellcheck-%{version} ../%{name}-%{version} @@ -119,6 +120,9 @@ make .tests %changelog +* Sat Mar 01 2014 Dridi - 0.3.1-4 +- executable dynamically linked to the library (bug #1069048) + * Sun Feb 09 2014 Dridi - 0.3.1-3 - removed Setup.hs, now available upstream - stop building the man page on ARM, no pandoc (bug #992430)