Attachment 2054349 Details for Bug 2271914 – The .spec file difference from Copr build 7222371 to 8189298

[patch] The .spec file difference from Copr build 7222371 to 8189298

spec-from-7222371-to-8189298.diff (text/plain), 9.25 KB, created by Fedora Review Service on 2024-10-30 11:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2024-10-30 11:38:15 UTC

Size: 9.25 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/7222371
>+++ https://copr.fedorainfracloud.org/coprs/build/8189298
>@@ -1,37 +1,33 @@
>-# generated by cabal-rpm-2.2.0
>+# generated by cabal-rpm-2.2.2
> # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
> 
> %global pkg_name stack
> %global pkgver %{pkg_name}-%{version}
> %{?haskell_setup}
> 
>-# testsuite missing deps: raw-strings-qq
>+%bcond tests 1
> 
> Name:           %{pkg_name}
>-Version:        2.9.3.1
>+Version:        2.15.7
> Release:        1%{?dist}
>-Summary:        Haskell stable packaging tool
>+Summary:        Haskell stable package build tool
> 
> License:        BSD-3-Clause
> Url:            https://haskellstack.org
> # Begin cabal-rpm sources:
> Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
>-Source1:        https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
> # End cabal-rpm sources
>-Source2:        stack-symlink-distro-ghc
>-# https://github.com/commercialhaskell/stack/issues/5866
>-# https://github.com/commercialhaskell/stack/pull/6028
>-Patch0:         6028-2.9.3.1.patch
>-Patch1:         stack-disable-ghc-Cabal-version-warnings.patch
>+Source1:        stack-symlink-distro-ghc
>+
>+Patch0:         stack-disabled-global-warnings.patch
> # https://github.com/commercialhaskell/stack/issues/6379
>-Patch2:         stack-Setup-Platforms.patch
>+Patch1:         stack-Setup-Platforms.patch
> 
> # Begin cabal-rpm deps:
>-BuildRequires:  dos2unix
> BuildRequires:  ghc-rpm-macros
> BuildRequires:  ghc-Cabal-devel
> BuildRequires:  ghc-aeson-devel
>-BuildRequires:  ghc-annotated-wl-pprint-devel
>+BuildRequires:  ghc-aeson-warning-parser-devel
> BuildRequires:  ghc-ansi-terminal-devel
> BuildRequires:  ghc-array-devel
> BuildRequires:  ghc-async-devel
>@@ -40,14 +36,11 @@
> BuildRequires:  ghc-base64-bytestring-devel
> BuildRequires:  ghc-bytestring-devel
> BuildRequires:  ghc-casa-client-devel
>-BuildRequires:  ghc-casa-types-devel
>-BuildRequires:  ghc-colour-devel
>+BuildRequires:  ghc-companion-devel
> BuildRequires:  ghc-conduit-devel
> BuildRequires:  ghc-conduit-extra-devel
> BuildRequires:  ghc-containers-devel
>-BuildRequires:  ghc-cryptonite-devel
>-BuildRequires:  ghc-cryptonite-conduit-devel
>-BuildRequires:  ghc-deepseq-devel
>+BuildRequires:  ghc-crypton-devel
> BuildRequires:  ghc-directory-devel
> BuildRequires:  ghc-echo-devel
> BuildRequires:  ghc-exceptions-devel
>@@ -57,9 +50,8 @@
> BuildRequires:  ghc-filepath-devel
> BuildRequires:  ghc-fsnotify-devel
> BuildRequires:  ghc-generic-deriving-devel
>+BuildRequires:  ghc-ghc-boot-devel
> BuildRequires:  ghc-githash-devel
>-BuildRequires:  ghc-hackage-security-devel
>-BuildRequires:  ghc-hashable-devel
> BuildRequires:  ghc-hi-file-parser-devel
> BuildRequires:  ghc-hpack-devel
> BuildRequires:  ghc-hpc-devel
>@@ -70,12 +62,9 @@
> BuildRequires:  ghc-http-types-devel
> BuildRequires:  ghc-memory-devel
> BuildRequires:  ghc-microlens-devel
>-BuildRequires:  ghc-mintty-devel
>-BuildRequires:  ghc-mono-traversable-devel
> BuildRequires:  ghc-mtl-devel
> BuildRequires:  ghc-mustache-devel
> BuildRequires:  ghc-neat-interpolation-devel
>-BuildRequires:  ghc-network-uri-devel
> BuildRequires:  ghc-open-browser-devel
> BuildRequires:  ghc-optparse-applicative-devel
> BuildRequires:  ghc-optparse-simple-devel
>@@ -84,42 +73,29 @@
> BuildRequires:  ghc-path-io-devel
> BuildRequires:  ghc-persistent-devel
> BuildRequires:  ghc-persistent-sqlite-devel
>-BuildRequires:  ghc-persistent-template-devel
> BuildRequires:  ghc-pretty-devel
>-BuildRequires:  ghc-primitive-devel
> BuildRequires:  ghc-process-devel
> BuildRequires:  ghc-project-template-devel
> BuildRequires:  ghc-random-devel
>-BuildRequires:  ghc-retry-devel
> BuildRequires:  ghc-rio-devel
> BuildRequires:  ghc-rio-prettyprint-devel
>-BuildRequires:  ghc-semigroups-devel
> BuildRequires:  ghc-split-devel
> BuildRequires:  ghc-stm-devel
>-BuildRequires:  ghc-streaming-commons-devel
> BuildRequires:  ghc-tar-devel
> BuildRequires:  ghc-template-haskell-devel
>-BuildRequires:  ghc-temporary-devel
> BuildRequires:  ghc-text-devel
>-BuildRequires:  ghc-text-metrics-devel
>-BuildRequires:  ghc-th-reify-many-devel
> BuildRequires:  ghc-time-devel
>-BuildRequires:  ghc-tls-devel
> BuildRequires:  ghc-transformers-devel
>-BuildRequires:  ghc-typed-process-devel
>-BuildRequires:  ghc-unicode-transforms-devel
> BuildRequires:  ghc-unix-devel
> BuildRequires:  ghc-unix-compat-devel
>-BuildRequires:  ghc-unliftio-devel
> BuildRequires:  ghc-unordered-containers-devel
> BuildRequires:  ghc-vector-devel
> BuildRequires:  ghc-yaml-devel
>-BuildRequires:  ghc-zip-archive-devel
> BuildRequires:  ghc-zlib-devel
> %if %{with ghc_prof}
> BuildRequires:  ghc-Cabal-prof
> BuildRequires:  ghc-aeson-prof
>-BuildRequires:  ghc-annotated-wl-pprint-prof
>+BuildRequires:  ghc-aeson-warning-parser-prof
> BuildRequires:  ghc-ansi-terminal-prof
> BuildRequires:  ghc-array-prof
> BuildRequires:  ghc-async-prof
>@@ -128,14 +104,11 @@
> BuildRequires:  ghc-base64-bytestring-prof
> BuildRequires:  ghc-bytestring-prof
> BuildRequires:  ghc-casa-client-prof
>-BuildRequires:  ghc-casa-types-prof
>-BuildRequires:  ghc-colour-prof
>+BuildRequires:  ghc-companion-prof
> BuildRequires:  ghc-conduit-prof
> BuildRequires:  ghc-conduit-extra-prof
> BuildRequires:  ghc-containers-prof
>-BuildRequires:  ghc-cryptonite-prof
>-BuildRequires:  ghc-cryptonite-conduit-prof
>-BuildRequires:  ghc-deepseq-prof
>+BuildRequires:  ghc-crypton-prof
> BuildRequires:  ghc-directory-prof
> BuildRequires:  ghc-echo-prof
> BuildRequires:  ghc-exceptions-prof
>@@ -145,9 +118,8 @@
> BuildRequires:  ghc-filepath-prof
> BuildRequires:  ghc-fsnotify-prof
> BuildRequires:  ghc-generic-deriving-prof
>+BuildRequires:  ghc-ghc-boot-prof
> BuildRequires:  ghc-githash-prof
>-BuildRequires:  ghc-hackage-security-prof
>-BuildRequires:  ghc-hashable-prof
> BuildRequires:  ghc-hi-file-parser-prof
> BuildRequires:  ghc-hpack-prof
> BuildRequires:  ghc-hpc-prof
>@@ -158,12 +130,9 @@
> BuildRequires:  ghc-http-types-prof
> BuildRequires:  ghc-memory-prof
> BuildRequires:  ghc-microlens-prof
>-BuildRequires:  ghc-mintty-prof
>-BuildRequires:  ghc-mono-traversable-prof
> BuildRequires:  ghc-mtl-prof
> BuildRequires:  ghc-mustache-prof
> BuildRequires:  ghc-neat-interpolation-prof
>-BuildRequires:  ghc-network-uri-prof
> BuildRequires:  ghc-open-browser-prof
> BuildRequires:  ghc-optparse-applicative-prof
> BuildRequires:  ghc-optparse-simple-prof
>@@ -172,39 +141,31 @@
> BuildRequires:  ghc-path-io-prof
> BuildRequires:  ghc-persistent-prof
> BuildRequires:  ghc-persistent-sqlite-prof
>-# no persistent-template prof:
>-#BuildRequires:  ghc-persistent-template-prof
> BuildRequires:  ghc-pretty-prof
>-BuildRequires:  ghc-primitive-prof
> BuildRequires:  ghc-process-prof
> BuildRequires:  ghc-project-template-prof
> BuildRequires:  ghc-random-prof
>-BuildRequires:  ghc-retry-prof
> BuildRequires:  ghc-rio-prof
> BuildRequires:  ghc-rio-prettyprint-prof
>-BuildRequires:  ghc-semigroups-prof
> BuildRequires:  ghc-split-prof
> BuildRequires:  ghc-stm-prof
>-BuildRequires:  ghc-streaming-commons-prof
> BuildRequires:  ghc-tar-prof
> BuildRequires:  ghc-template-haskell-prof
>-BuildRequires:  ghc-temporary-prof
> BuildRequires:  ghc-text-prof
>-BuildRequires:  ghc-text-metrics-prof
>-BuildRequires:  ghc-th-reify-many-prof
> BuildRequires:  ghc-time-prof
>-BuildRequires:  ghc-tls-prof
> BuildRequires:  ghc-transformers-prof
>-BuildRequires:  ghc-typed-process-prof
>-BuildRequires:  ghc-unicode-transforms-prof
> BuildRequires:  ghc-unix-prof
> BuildRequires:  ghc-unix-compat-prof
>-BuildRequires:  ghc-unliftio-prof
> BuildRequires:  ghc-unordered-containers-prof
> BuildRequires:  ghc-vector-prof
> BuildRequires:  ghc-yaml-prof
>-BuildRequires:  ghc-zip-archive-prof
> BuildRequires:  ghc-zlib-prof
>+%endif
>+%if %{with tests}
>+BuildRequires:  ghc-QuickCheck-devel
>+BuildRequires:  ghc-hspec-devel
>+BuildRequires:  ghc-hspec-discover-devel
>+BuildRequires:  ghc-raw-strings-qq-devel
> %endif
> BuildRequires:  help2man
> # End cabal-rpm deps
>@@ -262,7 +223,6 @@
> %prep
> # Begin cabal-rpm setup:
> %setup -q
>-dos2unix -k -n %{SOURCE1} %{name}.cabal
> %autopatch -p1
> # End cabal-rpm setup
> 
>@@ -277,14 +237,22 @@
> # Begin cabal-rpm install
> %ghc_lib_install
> 
>-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
>-%{buildroot}%{_bindir}/%{name} --bash-completion-script %{name} | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/%{name}
>+set noclobber
>+mkdir -p %{buildroot}%{bash_completions_dir}
>+%{buildroot}%{_bindir}/%{name} --bash-completion-script %{name} | sed s/filenames/default/ > %{buildroot}%{bash_completions_dir}/%{name}
> 
> mkdir -p %{buildroot}%{_mandir}/man1/
> help2man --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/%{name}.1
> # End cabal-rpm install
> 
>-install -p %{SOURCE2} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
>+install -p %{SOURCE1} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
>+
>+
>+%check
>+%if %{with tests}
>+PATH=%{buildroot}%{_bindir}:$PATH
>+%cabal_test
>+%endif
> 
> 
> %files
>@@ -292,7 +260,7 @@
> %license LICENSE
> %doc CONTRIBUTING.md ChangeLog.md README.md
> %{_bindir}/%{name}
>-%{_datadir}/bash-completion/completions/%{name}
>+%{bash_completions_dir}/%{name}
> %{_mandir}/man1/%{name}.1*
> # End cabal-rpm files
> %{_bindir}/stack-symlink-distro-ghc
>@@ -320,6 +288,9 @@
> 
> 
> %changelog
>+* Wed Oct 30 2024 Jens Petersen <petersen@redhat.com> - 2.15.7-1
>+- update to 2.15.7
>+
> * Wed Mar 27 2024 Jens Petersen <petersen@redhat.com> - 2.9.3.1-1
> - spec file generated by cabal-rpm-2.2.0
>

Actions: View | Diff

Attachments on bug 2271914: 2054349