Bug 1052117
Summary: | ShellCheck source dir is named shellcheck-version/ not ShellCheck-version/ | ||
---|---|---|---|
Product: | [Fedora] Fedora | Reporter: | Jens Petersen <petersen> |
Component: | ShellCheck | Assignee: | Dridi Boukelmoune <dridi.boukelmoune> |
Status: | CLOSED RAWHIDE | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
Severity: | unspecified | Docs Contact: | |
Priority: | unspecified | ||
Version: | rawhide | CC: | dridi.boukelmoune, haskell-devel, petersen |
Target Milestone: | --- | ||
Target Release: | --- | ||
Hardware: | Unspecified | ||
OS: | Unspecified | ||
Whiteboard: | |||
Fixed In Version: | ShellCheck-0.3.4-1.fc22 | Doc Type: | Bug Fix |
Doc Text: | Story Points: | --- | |
Clone Of: | Environment: | ||
Last Closed: | 2014-11-06 10:08:25 UTC | Type: | Bug |
Regression: | --- | Mount Type: | --- |
Documentation: | --- | CRM: | |
Verified Versions: | Category: | --- | |
oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
Cloudforms Team: | --- | Target Upstream Version: | |
Embargoed: | |||
Bug Depends On: | 1136297 | ||
Bug Blocks: |
Description
Jens Petersen
2014-01-13 11:05:07 UTC
I'm in the process of upgrading to 0.3.1, but I'll get in touch with upstream once it's done. A tarball in the expected form is available at: http://hackage.haskell.org/package/ShellCheck-0.3.1/ShellCheck-0.3.1.tar.gz But it doesn't contain the test/ folder and the Makefile: https://github.com/koalaman/shellcheck/archive/v0.3.1.tar.gz So for this release I'll go with the workaround, but it won't work "as is" because of the way %setup seems to work. Anyway I've made a new build for rawhide, I hope this temporarily solves the issue: http://koji.fedoraproject.org/koji/taskinfo?taskID=6492554 Thanks a lot - sounds good, worksforme. :) Will future hackage releases include those missing files? (In reply to Jens Petersen from comment #2) > Will future hackage releases include those missing files? That's my goal, it's basically missing everything but the Haskell sources and the cabal file. I suspect it has been generated with some cabal-related tooling that needs to be told to include the missing files (forgot to mention the brand new man page too). Okay let me know if I can be of any help: I could point at some other example .cabal files if it helps. Yes please, my cabal/build knowledge is rather limited, as you can see in my Setup.hs file here: http://pkgs.fedoraproject.org/cgit/ShellCheck.git/tree/ShellCheck.spec?&id=b0905b2#n65 Thanks to you I've just noticed a similar one now exists upstream: https://github.com/koalaman/shellcheck/blob/197b3e3/Setup.hs Cool - you added building the manpage with pandoc. :) Unfortunately currently there is no pandoc on arm so you may want to disable the pandoc dep on armv7hl... (this should get fixed hopefully soon in Rawhide at least.) Also I think you could simply the spec a bit: diff --git a/ShellCheck.spec b/ShellCheck.spec index 8d8bffd..44ffc8a 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -60,25 +60,18 @@ This package provides the Haskell %{name} library development files. %setup -q -n shellcheck-%{version} # 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 <<EOF -import Distribution.Simple - -main = defaultMain -EOF +if [ ! -d ../%{name}-%{version} ]; then + ln -s shellcheck-%{version} ../%{name}-%{version} +fi %build -cd %{_builddir}/%{name}-%{version} %ghc_lib_build make shellcheck.1 %install -cd %{_builddir}/%{name}-%{version} %ghc_lib_install mkdir -p %{buildroot}%{_mandir}/man1 Sorry you also need: === diff --git a/ShellCheck.spec b/ShellCheck.spec index 8d8bffd..c010758 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -81,8 +81,8 @@ make shellcheck.1 cd %{_builddir}/%{name}-%{version} %ghc_lib_install -mkdir -p %{buildroot}%{_mandir}/man1 -install -t %{buildroot}%{_mandir}/man1 shellcheck.1 +install -D -p -m 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 + %check === to fix the manpage permission. For a .cabal file example including test cases and even building a manpage I recommend looking at pandoc - it might be a bit long or do more than you need but I think it is a reasonable example. http://hackage.haskell.org/package/pandoc -> http://hackage.haskell.org/package/pandoc-1.12.3.3/pandoc.cabal or https://github.com/jgm/pandoc/blob/master/pandoc.cabal (In reply to Jens Petersen from comment #6) > Cool - you added building the manpage with pandoc. :) Of course I did, since I originally wrote and submitted it upstream ! > Unfortunately currently there is no pandoc on arm > so you may want to disable the pandoc dep on armv7hl... > (this should get fixed hopefully soon in Rawhide at least.) Yeah, by the time I'd seen that, it was too late for me to fix until today. New (scratch) build, merged with your diffs: http://koji.fedoraproject.org/koji/taskinfo?taskID=6509906 I'll submit that as the next update. (In reply to Jens Petersen from comment #7) > For a .cabal file example including test cases and even building a manpage > I recommend looking at pandoc - it might be a bit long or do more than > you need but I think it is a reasonable example. > > http://hackage.haskell.org/package/pandoc -> > http://hackage.haskell.org/package/pandoc-1.12.3.3/pandoc.cabal > or > https://github.com/jgm/pandoc/blob/master/pandoc.cabal Thanks, my next course of action is to actually fix this bug and make sure the tarball on hackage meets both our requirements :) Sorry for being unresponsive so long, but I have sent a patch upstream today: https://github.com/koalaman/shellcheck/pull/169 No worries: I added ShellCheck to https://fedoraproject.org/wiki/Upstream_release_monitoring just now, so you should get alerts of new releases via bugzilla from now on. I hope QuickCheck 2.6 may be sufficient for the time being since I don't think a newer version will appear in Fedora until next year. (In reply to Jens Petersen from comment #10) > No worries: I added ShellCheck to > https://fedoraproject.org/wiki/Upstream_release_monitoring > just now, so you should get alerts of new releases via bugzilla > from now on. I could have sworn I had already added it, thanks! > I hope QuickCheck 2.6 may be sufficient for the time being > since I don't think a newer version will appear in Fedora > until next year. Sure, I will try that instead like I said in bug 1081471. Actually, 0.3.4 depends on QuickCheck > 2.2, it's the master branch that depends on 2.7.4+. I've misread the build log when it failed. I believe this is fixed in ShellCheck-0.3.4-1.fc22, thanks! |