From 8f2079d00a94eae1dbe94c0610a2ab7d11cd72c7df2e2c4145adac58be5979fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 16 Jul 2016 21:50:04 +0000 Subject: [PATCH] Accepting request 411130 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/411130 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ShellCheck?expand=0&rev=9 --- ShellCheck.changes | 5 +++++ ShellCheck.spec | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ShellCheck.changes b/ShellCheck.changes index 98092a4..b67d768 100644 --- a/ShellCheck.changes +++ b/ShellCheck.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:33:18 UTC 2016 - psimons@suse.com + +- Update to version 0.4.4 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sat May 21 15:40:14 UTC 2016 - mimi.vx@gmail.com diff --git a/ShellCheck.spec b/ShellCheck.spec index 978cbb8..0adc3a5 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -17,24 +17,18 @@ %global pkg_name ShellCheck - %bcond_with tests - -Name: ShellCheck +Name: %{pkg_name} Version: 0.4.4 Release: 0 Summary: Shell script analysis tool License: GPL-3.0+ Group: Development/Languages/Other - Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel @@ -43,6 +37,8 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-regex-tdfa-devel +BuildRequires: ghc-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description @@ -57,7 +53,6 @@ causes a shell to behave strangely and counter-intuitively. * To point out subtle caveats, corner cases and pitfalls, that may cause an advanced user's otherwise working script to fail under future circumstances. - %package -n ghc-%{name} Summary: Haskell %{name} library Group: System/Libraries @@ -65,35 +60,38 @@ Group: System/Libraries %description -n ghc-%{name} This package provides the Haskell %{name} shared library. - %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files Group: Development/Libraries/Other +Requires: ghc-%{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: ghc-%{name} = %{version}-%{release} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library development files. - %prep %setup -q + %build %ghc_lib_build + %install %ghc_lib_install + %ghc_fix_dynamic_rpath shellcheck + install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post -n ghc-%{name}-devel %ghc_pkg_recache @@ -113,5 +111,6 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) +%doc README.md %changelog