From 6b316856a78c294ffdb5f05614c84522899cda3e Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Feb 23 2017 00:35:37 +0000
Subject: update to 1.24.0.2 with subpackages


---

diff --git a/.gitignore b/.gitignore
index 090a4ac..bc3dc17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cabal-install-0.8.2.tar.gz
 /cabal-install-1.18.1.0.tar.gz
 /cabal-install-1.22.6.0.tar.gz
 /cabal-install-1.22.9.0.tar.gz
+/cabal-install-1.24.0.2.tar.gz
diff --git a/cabal-install.spec b/cabal-install.spec
index 6a38726..df01dcc 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,29 +1,40 @@
+# generated by cabal-rpm-0.11.1
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
-%bcond_with tests
+%global ed25519 ed25519-0.0.5.0
+%global cryptohashsha256 cryptohash-sha256-0.11.100.1
+%global hackagesecurity hackage-security-0.5.2.2
 
-%global binname cabal
+%bcond_with tests
 
 Name:           cabal-install
-# part of haskell-platform
-Version:        1.22.9.0
-Release:        3%{?dist}
-Summary:        Command-line interface for Cabal and Hackage
+Version:        1.24.0.2
+Release:        1%{?dist}
+Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        cabal-install.sh
+Source1:        https://hackage.haskell.org/package/%{cryptohashsha256}/%{cryptohashsha256}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{hackagesecurity}/%{hackagesecurity}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{ed25519}/%{ed25519}.tar.gz
+Source10:        cabal-install.sh
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-rpm-macros-extra
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-array-devel
+BuildRequires:  ghc-async-devel
+BuildRequires:  ghc-base16-bytestring-devel
+BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
+#BuildRequires:  ghc-cryptohash-sha256-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
+#BuildRequires:  ghc-hackage-security-devel
+BuildRequires:  ghc-hashable-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-network-uri-devel
@@ -31,17 +42,17 @@ BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-stm-devel
+BuildRequires:  ghc-tar-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-zlib-devel
 %if %{with tests}
-BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-QuickCheck-devel
-BuildRequires:  ghc-extensible-exceptions-devel
 BuildRequires:  ghc-regex-posix-devel
-BuildRequires:  ghc-test-framework-devel
-BuildRequires:  ghc-test-framework-hunit-devel
-BuildRequires:  ghc-test-framework-quickcheck2-devel
+BuildRequires:  ghc-tagged-devel
+BuildRequires:  ghc-tasty-devel
+BuildRequires:  ghc-tasty-hunit-devel
+BuildRequires:  ghc-tasty-quickcheck-devel
 %endif
 # End cabal-rpm deps
 Requires:       ghc-compiler
@@ -60,22 +71,43 @@ software by automating the fetching, configuration, compilation and
 installation of Haskell libraries and programs from Hackage.
 
 
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage %{ed25519}
+%ghc_lib_subpackage %{cryptohashsha256}
+%ghc_lib_subpackage %{hackagesecurity}
+%endif
+
+%global version %{main_version}
+
+
 %prep
-%setup -q
+%setup -q -a1 -a2 -a3
+
+cd %{hackagesecurity}
+cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
+
+cd ../%{ed25519}
+cabal-tweak-dep-ver ghc-prim '< 0.5' '< 0.6'
 
 
 %build
+%ghc_libs_build %{ed25519} %{cryptohashsha256} %{hackagesecurity}
 %ghc_bin_build
 
 
 %install
+%ghc_libs_install %{ed25519} %{cryptohashsha256} %{hackagesecurity}
 %ghc_bin_install
 
+%ghc_fix_rpath %{ed25519} %{cryptohashsha256} %{hackagesecurity}
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 
 %check
@@ -84,13 +116,17 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %files
 %license LICENSE
-%doc README.md
+%doc README.md changelog
 %{_bindir}/cabal
 %config(noreplace) %{_sysconfdir}/bash_completion.d/cabal
 %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh
+%{_mandir}/man1/cabal.1*
 
 
 %changelog
+* Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.24.0.2-1
+- update to 1.24.0.2
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.9.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 16ce241..04319d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-460995d67a9dc65f04bd2a68eaccf6a5  cabal-install-1.22.9.0.tar.gz
+SHA512 (cabal-install-1.24.0.2.tar.gz) = bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0