now depends on ghc instead of ghc-lib-parser

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -17,3 +17,28 @@ hlint-1.7.3.tar.gz
 /hlint-1.8.50.tar.gz
 /hlint-1.9.4.tar.gz
 /hlint-1.9.10.tar.gz
+/hlint-1.9.41.tar.gz
+/clock-0.7.2.tar.gz
+/refact-0.3.0.2.tar.gz
+/extra-1.5.1.tar.gz
+/hlint-2.0.9.tar.gz
+/hlint-2.0.11.tar.gz
+/hlint-2.1.5.tar.gz
+/hlint-2.1.7.tar.gz
+/hlint-2.1.8.tar.gz
+/hlint-2.1.11.tar.gz
+/hlint-2.1.26.tar.gz
+/ghc-lib-parser-8.8.0.20190424.tar.gz
+/hlint-2.2.11.tar.gz
+/ghc-lib-parser-8.8.3.20200412.1.tar.gz
+/ghc-lib-parser-ex-8.8.5.8.tar.gz
+/hlint-3.1.4.tar.gz
+/hlint-3.1.6.tar.gz
+/ghc-lib-parser-8.10.1.20200523.tar.gz
+/ghc-lib-parser-ex-8.10.0.15.tar.gz
+/hlint-3.2.7.tar.gz
+/ghc-lib-parser-ex-8.10.0.19.tar.gz
+/hlint-3.2.8.tar.gz
+/hlint-3.4.1.tar.gz
+/ghc-lib-parser-ex-9.2.0.4.tar.gz
+/deriving-aeson-0.2.9.tar.gz

hlint-3.4.1.cabal

@@ -0,0 +1,186 @@
+cabal-version:      1.18
+build-type:         Simple
+name:               hlint
+version:            3.4.1
+x-revision: 1
+license:            BSD3
+license-file:       LICENSE
+category:           Development
+author:             Neil Mitchell <ndmitchell@gmail.com>
+maintainer:         Neil Mitchell <ndmitchell@gmail.com>
+copyright:          Neil Mitchell 2006-2022
+synopsis:           Source code suggestions
+description:
+    HLint gives suggestions on how to improve your source code.
+homepage:           https://github.com/ndmitchell/hlint#readme
+bug-reports:        https://github.com/ndmitchell/hlint/issues
+data-dir:           data
+data-files:
+    hlint.yaml
+    default.yaml
+    Test.hs
+    report_template.html
+    hs-lint.el
+    hlint.1
+    hlint.ghci
+    HLint_QuickCheck.hs
+    HLint_TypeCheck.hs
+extra-source-files:
+    .hlint.yaml
+    data/*.hs
+    data/*.yaml
+    tests/*.test
+    -- These are needed because of haskell/cabal#7862
+    data/default.yaml
+    data/hlint.yaml
+    data/report_template.html
+extra-doc-files:
+    README.md
+    CHANGES.txt
+tested-with:        GHC==9.0, GHC==8.10, GHC==8.8
+
+source-repository head
+    type:     git
+    location: https://github.com/ndmitchell/hlint.git
+
+flag threaded
+    default: True
+    manual: True
+    description: Build with support for multithreaded execution
+
+flag gpl
+    default: True
+    manual: True
+    description: Use GPL libraries, specifically hscolour
+
+flag ghc-lib
+  default: False
+  manual: True
+  description: Force dependency on ghc-lib-parser even if GHC API in the ghc package is supported
+
+flag hsyaml
+  default: False
+  manual: True
+  description: Use HsYAML instead of yaml
+
+library
+    default-language:   Haskell2010
+    build-depends:
+        base == 4.*, process, filepath, directory, containers,
+        unordered-containers, vector, text, bytestring,
+        transformers,
+        file-embed,
+        utf8-string,
+        data-default >= 0.3,
+        cpphs >= 1.20.1,
+        cmdargs >= 0.10,
+        uniplate >= 1.5,
+        ansi-terminal >= 0.8.1,
+        extra >= 1.7.3,
+        refact >= 0.3,
+        aeson >= 1.3,
+        deriving-aeson >= 0.2,
+        filepattern >= 0.1.1
+
+    if !flag(ghc-lib) && impl(ghc >= 9.2.2) && impl(ghc < 9.3.0)
+      build-depends:
+        ghc == 9.2.*,
+        ghc-boot-th,
+        ghc-boot
+    else
+      build-depends:
+          ghc-lib-parser == 9.2.*
+    build-depends:
+        ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.2
+
+    if flag(gpl)
+        build-depends: hscolour >= 1.21
+    else
+        cpp-options: -DGPL_SCARES_ME
+
+    if flag(hsyaml)
+        build-depends:
+          HsYAML >= 0.2,
+          HsYAML-aeson >= 0.2
+        cpp-options: -DHS_YAML
+    else
+        build-depends: yaml >= 0.5.0
+
+    hs-source-dirs:     src
+    exposed-modules:
+        Language.Haskell.HLint
+    other-modules:
+        Paths_hlint
+        Apply
+        CmdLine
+        Extension
+        Fixity
+        HLint
+        HsColour
+        Idea
+        Report
+        Util
+        Parallel
+        Refact
+        Timing
+        CC
+        EmbedData
+        Summary
+        Config.Compute
+        Config.Haskell
+        Config.Read
+        Config.Type
+        Config.Yaml
+
+        GHC.All
+        GHC.Util
+        GHC.Util.ApiAnnotation
+        GHC.Util.View
+        GHC.Util.Brackets
+        GHC.Util.DynFlags
+        GHC.Util.FreeVars
+        GHC.Util.HsDecl
+        GHC.Util.HsExpr
+        GHC.Util.SrcLoc
+        GHC.Util.Scope
+        GHC.Util.Unify
+
+        Hint.All
+        Hint.Bracket
+        Hint.Comment
+        Hint.Duplicate
+        Hint.Export
+        Hint.Extensions
+        Hint.Fixities
+        Hint.Import
+        Hint.Lambda
+        Hint.List
+        Hint.ListRec
+        Hint.Match
+        Hint.Monad
+        Hint.Naming
+        Hint.NewType
+        Hint.Pattern
+        Hint.Pragma
+        Hint.Restrict
+        Hint.Smell
+        Hint.Type
+        Hint.Unsafe
+        Hint.NumLiteral
+        Test.All
+        Test.Annotations
+        Test.InputOutput
+        Test.Util
+    ghc-options: -Wunused-binds -Wunused-imports -Worphans
+
+
+executable hlint
+    default-language:   Haskell2010
+    build-depends:      base, hlint
+    main-is:            src/Main.hs
+
+    -- See https://github.com/ndmitchell/hlint/pull/1169 for benchmarks
+    -- that indicate -A32 is a good idea
+    ghc-options:        -rtsopts -with-rtsopts=-A32m
+    if flag(threaded)
+        ghc-options:    -threaded

hlint.spec

@@ -1,38 +1,111 @@
-# https://fedoraproject.org/wiki/Packaging:Haskell
+# generated by cabal-rpm-2.1.0 --subpackage
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name hlint
+%global pkgver %{pkg_name}-%{version}
+
+%global ghclibparserex ghc-lib-parser-ex-9.2.0.4
+%global derivingaeson deriving-aeson-0.2.9
+%global subpkgs %{ghclibparserex} %{derivingaeson}
 
 Name:           %{pkg_name}
-Version:        1.9.10
-Release:        4%{?dist}
+Version:        3.4.1
+# can only be reset when all subpkgs bumped
+Release:        1%{?dist}
 Summary:        Haskell source code suggestions
 
-License:        BSD
+License:        BSD-3-Clause
 Url:            https://hackage.haskell.org/package/%{name}
-Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch0:         hlint-1.9.10-build-fixes.patch
+# Begin cabal-rpm sources:
+Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{ghclibparserex}/%{ghclibparserex}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{derivingaeson}/%{derivingaeson}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
+# End cabal-rpm sources
+# ghc-lib-parser build fails on s390x
+# https://bugzilla.redhat.com/show_bug.cgi?id=1806109
+#ExcludeArch:    s390x
 
-BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-aeson-devel
+BuildRequires:  ghc-ansi-terminal-devel
+BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-cmdargs-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-cpphs-devel
+BuildRequires:  ghc-data-default-devel
+#BuildRequires:  ghc-deriving-aeson-devel
 BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extra-devel
+BuildRequires:  ghc-file-embed-devel
 BuildRequires:  ghc-filepath-devel
-BuildRequires:  ghc-haskell-src-exts-devel
+BuildRequires:  ghc-filepattern-devel
+BuildRequires:  ghc-ghc-devel
+BuildRequires:  ghc-ghc-boot-devel
+BuildRequires:  ghc-ghc-boot-th-devel
+#BuildRequires:  ghc-ghc-lib-parser-ex-devel
 BuildRequires:  ghc-hscolour-devel
 BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-refact-devel
+BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-uniplate-devel
+BuildRequires:  ghc-unordered-containers-devel
+BuildRequires:  ghc-utf8-string-devel
+BuildRequires:  ghc-vector-devel
+BuildRequires:  ghc-yaml-devel
+%if %{with ghc_prof}
+BuildRequires:  ghc-aeson-prof
+BuildRequires:  ghc-ansi-terminal-prof
+BuildRequires:  ghc-base-prof
+BuildRequires:  ghc-bytestring-prof
+BuildRequires:  ghc-cmdargs-prof
+BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-cpphs-prof
+BuildRequires:  ghc-data-default-prof
+#BuildRequires:  ghc-deriving-aeson-prof
+BuildRequires:  ghc-directory-prof
+BuildRequires:  ghc-extra-prof
+BuildRequires:  ghc-file-embed-prof
+BuildRequires:  ghc-filepath-prof
+BuildRequires:  ghc-filepattern-prof
+BuildRequires:  ghc-ghc-prof
+BuildRequires:  ghc-ghc-boot-prof
+BuildRequires:  ghc-ghc-boot-th-prof
+#BuildRequires:  ghc-ghc-lib-parser-ex-prof
+BuildRequires:  ghc-hscolour-prof
+BuildRequires:  ghc-process-prof
+BuildRequires:  ghc-refact-prof
+BuildRequires:  ghc-text-prof
+BuildRequires:  ghc-transformers-prof
+BuildRequires:  ghc-uniplate-prof
+BuildRequires:  ghc-unordered-containers-prof
+BuildRequires:  ghc-utf8-string-prof
+BuildRequires:  ghc-vector-prof
+BuildRequires:  ghc-yaml-prof
+%endif
+Requires:       %{name}-common = %{version}-%{release}
 # End cabal-rpm deps
 
 %description
 HLint gives suggestions on how to improve your source code.
 
 
+%package common
+Summary:        %{name} common files
+BuildArch:      noarch
+
+%description common
+This package provides the %{name} common data files.
+
+
 %package -n ghc-%{name}
 Summary:        Haskell %{name} library
+Requires:       %{name}-common = %{version}-%{release}
 
 %description -n ghc-%{name}
 This package provides the Haskell %{name} shared library.
@@ -41,55 +114,216 @@ This package provides the Haskell %{name} shared library.
 %package -n ghc-%{name}-devel
 Summary:        Haskell %{name} library development files
 Provides:       ghc-%{name}-static = %{version}-%{release}
+Provides:       ghc-%{name}-static%{?_isa} = %{version}-%{release}
+%if %{defined ghc_version}
 Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
+%endif
 Requires:       ghc-%{name}%{?_isa} = %{version}-%{release}
 
 %description -n ghc-%{name}-devel
 This package provides the Haskell %{name} library development files.
 
 
+%if %{with haddock}
+%package -n ghc-%{name}-doc
+Summary:        Haskell %{name} library documentation
+BuildArch:      noarch
+Requires:       ghc-filesystem
+
+%description -n ghc-%{name}-doc
+This package provides the Haskell %{name} library documentation.
+%endif
+
+
+%if %{with ghc_prof}
+%package -n ghc-%{name}-prof
+Summary:        Haskell %{name} profiling library
+Requires:       ghc-%{name}-devel%{?_isa} = %{version}-%{release}
+Supplements:    (ghc-%{name}-devel and ghc-prof)
+
+%description -n ghc-%{name}-prof
+This package provides the Haskell %{name} profiling library.
+%endif
+
+
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage -l BSD-3-Clause %{ghclibparserex}
+%ghc_lib_subpackage -l BSD-3-Clause %{derivingaeson}
+%endif
+
+%global version %{main_version}
+
+
 %prep
-%setup -q
-%patch0 -p1 -b .orig
+# Begin cabal-rpm setup:
+%setup -q -a1 -a2
+dos2unix -k -n %{SOURCE3} %{name}.cabal
+# End cabal-rpm setup
 
 
 %build
+%ifarch armv7hl
+# https://bugzilla.redhat.com/show_bug.cgi?id=1806116
+%define cabal_configure_options --ghc-options="-O0"
+%endif
+# Begin cabal-rpm build:
+%ghc_libs_build %{subpkgs}
 %ghc_lib_build
+# End cabal-rpm build
 
 
 %install
+# Begin cabal-rpm install
+%ghc_libs_install %{subpkgs}
 %ghc_lib_install
+mv %{buildroot}%{_ghcdocdir}{,-common}
+# End cabal-rpm install
 
 mkdir -p %{buildroot}%{_mandir}/man1
 mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man1
 
 
-%post -n ghc-%{name}-devel
-%ghc_pkg_recache
-
-
-%postun -n ghc-%{name}-devel
-%ghc_pkg_recache
-
-
 %files
-%doc LICENSE
-%doc README.md
+# Begin cabal-rpm files:
 %{_bindir}/%{name}
-%{_datadir}/%{name}-%{version}
+# End cabal-rpm files
 %{_mandir}/man1/%{name}*
 
 
+%files common
+# Begin cabal-rpm files:
+%license LICENSE
+%doc CHANGES.txt README.md
+%{_datadir}/%{pkgver}
+# End cabal-rpm files
+
+
 %files -n ghc-%{name} -f ghc-%{name}.files
-%doc LICENSE
 
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 
 
+%if %{with haddock}
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
+%license LICENSE
+%endif
+
+
+%if %{with ghc_prof}
+%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
+%endif
+
+
 %changelog
+* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 3.4.1-6
+- https://hackage.haskell.org/package/hlint-3.4.1/changelog
+- now depends on ghc instead of ghc-lib-parser
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 3.2.8-4
+- https://hackage.haskell.org/package/hlint-3.2.8/changelog
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 3.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
+* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 3.2.7-1
+- update to 3.2.7
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep  3 2020 Jens Petersen <petersen@redhat.com> - 3.1.6-6
+- ghc-lib-parser was packaged
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Jens Petersen <petersen@redhat.com> - 3.1.6-4
+- enable armv7hl with -O0
+
+* Thu Jul 16 2020 Jens Petersen <petersen@redhat.com> - 3.1.6-3
+- update to 3.1.6
+
+* Fri Jun 19 2020 Jens Petersen <petersen@redhat.com> - 3.1.4-2
+- update to 3.1.4
+
+* Wed Jun 10 2020 Jens Petersen <petersen@redhat.com> - 2.2.11-1
+- https://hackage.haskell.org/package/hlint-2.2.11/changelog
+- depends on ghc-lib-parser-ex
+
+* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 2.1.26-1
+- update to 2.1.26
+- add ghc-lib-parser: exclude s390x (#1806109) and armv7hl (#1806116)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 2.1.11-3
+- add doc and prof subpackages (cabal-rpm-1.0.0)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Feb 21 2019 Jens Petersen <petersen@redhat.com> - 2.1.11-1
+- update to 2.1.11
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Oct 24 2018 Jens Petersen <petersen@redhat.com> - 2.1.8-2
+- rebuild for static executable
+
+* Thu Jul 26 2018 Jens Petersen <petersen@redhat.com> - 2.1.8-1
+- update to 2.1.8
+
+* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 2.1.7-1
+- update to 2.1.7
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun  1 2018 Jens Petersen <petersen@redhat.com> - 2.0.11-9
+- refact is now packaged
+
+* Tue Apr 10 2018 Jens Petersen <petersen@redhat.com> - 2.0.11-8
+- datadir should be in ghc-hlint (#1564707)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com> - 2.0.11-6
+- update to 2.0.11
+
+* Tue Jan 09 2018 Jens Petersen <petersen@redhat.com> - 2.0.9-5
+- clock and extra packaged
+
+* Tue Jan  2 2018 Jens Petersen <petersen@redhat.com> - 2.0.9-4
+- update to 2.0.9
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.41-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 1.9.41-1
+- update to 1.9.41
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Jun 21 2016 Jens Petersen <petersen@redhat.com> - 1.9.10-4
 - build fixes for newer ghc8 and newer hscolour
 

sources

@@ -1 +1,3 @@
-811f8480fa524f8febb63741bdcee5c1  hlint-1.9.10.tar.gz
+SHA512 (hlint-3.4.1.tar.gz) = 6c41235c9c36588d2760af84a251b078ebc31762e8ad91c817a500c787866d34a0eae92298ebad7ed57ac9df678018c52cce990e767ea64ffebc3a6ff68b51d1
+SHA512 (ghc-lib-parser-ex-9.2.0.4.tar.gz) = 7d33a712eacf7f959c0adc0f72890ffc2c3298e1eb8cb6c82571804ba15a0d8cbb80a1b54f5a3bd9c434e2918149a35ccecc4f444ff8b227ea89db034dbeedbe
+SHA512 (deriving-aeson-0.2.9.tar.gz) = d5112d03e8e117001a88acfed3dde85ba7c8323fbc27169215a6656787caad20faf63563558ac6ef6b8412d2fea38530ed2dcb701e7f3d952cf8ad261b49293a