From f054d13d9c2de94451d2d8db533d9dcba11482fe Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 28 Feb 2019 12:14:32 +0800
Subject: [PATCH 1/2] install bash-completion file under datadir (#1683879)

---
 cabal-install.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cabal-install.spec b/cabal-install.spec
index 8a660f8..7f61c66 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -6,7 +6,7 @@
 
 Name:           cabal-install
 Version:        2.0.0.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
@@ -86,11 +86,9 @@ cp -p %{SOURCE1} %{name}.cabal
 %install
 %ghc_bin_install
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -pm 644 -D -t %{buildroot}%{_datadir}/bash-completion/completions/ bash-completion/cabal
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 -D -t %{buildroot}%{_sysconfdir}/profile.d/ %{SOURCE10}
 
 
 %check
@@ -101,12 +99,15 @@ install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 %license LICENSE
 %doc README.md changelog
 %{_bindir}/cabal
-%config(noreplace) %{_sysconfdir}/bash_completion.d/cabal
 %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh
+%{_datadir}/bash-completion/completions/cabal
 %{_mandir}/man1/cabal.1*
 
 
 %changelog
+* Thu Feb 28 2019 Jens Petersen <petersen@redhat.com> - 2.0.0.1-11
+- install bash-completion file under datadir (Chris King-Parra, #1683879)
+
 * Fri Dec 14 2018 Jens Petersen <petersen@redhat.com> - 2.0.0.1-10
 - drop the rpmlint whitelist of ghc-Cabal-devel again since no longer Requires
 

From 91ae57f551e9bf93a591a4a469b1da543c42df62 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 30 Jul 2025 14:00:49 +0800
Subject: [PATCH 2/2] update list of Hackage repo root keys to versions from
 3.10.3

---
 cabal-install.spec                  |  7 ++++++-
 update-hackage-repo-root-keys.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 update-hackage-repo-root-keys.patch

diff --git a/cabal-install.spec b/cabal-install.spec
index 7f61c66..f3f8e6f 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -6,7 +6,7 @@
 
 Name:           cabal-install
 Version:        2.0.0.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
@@ -15,6 +15,7 @@ Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
 Source1:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}.cabal#/%{name}-%{version}.cabal
 
 Source10:       cabal-install.sh
+Patch0:         update-hackage-repo-root-keys.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -76,6 +77,7 @@ installation of Haskell libraries and programs.
 
 %prep
 %setup -q
+%patch -P0 -p1 -b .orig
 cp -p %{SOURCE1} %{name}.cabal
 
 
@@ -105,6 +107,9 @@ install -pm 644 -D -t %{buildroot}%{_sysconfdir}/profile.d/ %{SOURCE10}
 
 
 %changelog
+* Wed Jul 30 2025 Jens Petersen <petersen@redhat.com> - 2.0.0.1-12
+- update list of Hackage repo root keys to versions from 3.10.3
+
 * Thu Feb 28 2019 Jens Petersen <petersen@redhat.com> - 2.0.0.1-11
 - install bash-completion file under datadir (Chris King-Parra, #1683879)
 
diff --git a/update-hackage-repo-root-keys.patch b/update-hackage-repo-root-keys.patch
new file mode 100644
index 0000000..15c0589
--- /dev/null
+++ b/update-hackage-repo-root-keys.patch
@@ -0,0 +1,28 @@
+--- cabal-install-3.2.0.0/Distribution/Client/Config.hs~	2001-09-09 09:46:40.000000000 +0800
++++ cabal-install-3.2.0.0/Distribution/Client/Config.hs	2025-07-29 14:08:06.225646657 +0800
+@@ -694,12 +694,19 @@
+ --
+ defaultHackageRemoteRepoKeys :: [String]
+ defaultHackageRemoteRepoKeys =
+-    [ "fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0",
+-      "1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42",
+-      "2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3",
+-      "0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d",
+-      "51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921"
+-    ]
++  [ -- Adam Gundry (uRPdSiL3/MNsk50z6NB55ABo0OrrNDXigtCul4vtzmw=)
++    "fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0"
++  , -- Gershom Bazerman (bYoUXXQ9TtX10UriaMiQtTccuXPGnmldP68djzZ7cLo=)
++    "1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42"
++  , -- John Wiegley (zazm5w480r+zPO6Z0+8fjGuxZtb9pAuoVmQ+VkuCvgU=)
++    "0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d"
++  , -- Norman Ramsey (ZI8di3a9Un0s2RBrt5GwVRvfOXVuywADfXGPZfkiDb0=)
++    "51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921"
++  , -- Mathieu Boespflug (ydN1nGGQ79K1Q0nN+ul+Ln8MxikTB95w0YdGd3v3kmg=)
++    "be75553f3c7ba1dbe298da81f1d1b05c9d39dd8ed2616c9bddf1525ca8c03e48"
++  , -- Joachim Breitner (5iUgwqZCWrCJktqMx0bBMIuoIyT4A1RYGozzchRN9rA=)
++    "d26e46f3b631aae1433b89379a6c68bd417eb5d1c408f0643dcc07757fece522"
++  ]
+ 
+ -- | The required threshold of root key signatures for hackage.haskell.org
+ --