From a0eb1e96e820a1fd09fef5393eaaceceb9ff147487dbafd9f6137553ffc58e8d Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Thu, 30 Mar 2023 08:26:48 +0000
Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.4.x
 package:ghc-rpm-macros revision:13, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=107
---
 ghc-rpm-macros-1.9.95.tar.xz |  3 ---
 ghc-rpm-macros-2.5.2.tar.xz  |  3 +++
 ghc-rpm-macros.changes       | 15 +++++++++++++++
 ghc-rpm-macros.spec          | 15 ++++-----------
 4 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 ghc-rpm-macros-1.9.95.tar.xz
 create mode 100644 ghc-rpm-macros-2.5.2.tar.xz

diff --git a/ghc-rpm-macros-1.9.95.tar.xz b/ghc-rpm-macros-1.9.95.tar.xz
deleted file mode 100644
index 6247a5a..0000000
--- a/ghc-rpm-macros-1.9.95.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7303329dee9f08f8809e795f9ca293b2c9fff2eb65aa7170b6c79261a67d18
-size 17044
diff --git a/ghc-rpm-macros-2.5.2.tar.xz b/ghc-rpm-macros-2.5.2.tar.xz
new file mode 100644
index 0000000..d37dd46
--- /dev/null
+++ b/ghc-rpm-macros-2.5.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:706ef0a8f12a778a637fd86faef52224c89f60674fb86764d0e8aa4a6835caeb
+size 30852
diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes
index 43d24a6..c3d2b33 100644
--- a/ghc-rpm-macros.changes
+++ b/ghc-rpm-macros.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Mar 18 18:33:27 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- update to 2.5.2
+ * fix ghc-pkg-wrapper in ghc build env
+ * ghc_merge_filelist macro
+
+-------------------------------------------------------------------
+Thu Mar 16 18:26:11 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- update to 2.5.0
+ * sync with fedora
+ * enable -prof packages
+ * support for hadrian
+
 -------------------------------------------------------------------
 Mon Nov  1 05:59:41 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 3adb8cc..07d5301 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -18,7 +18,7 @@
 
 %global without_hscolour 1
 Name:           ghc-rpm-macros
-Version:        1.9.95
+Version:        2.5.2
 Release:        0
 Summary:        RPM Macros for building packages for GHC
 License:        GPL-3.0-or-later
@@ -28,6 +28,7 @@ URL:            https://fedoraproject.org/wiki/Haskell_SIG
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  xz
 Requires:       rpm
+Requires:       chrpath
 BuildArch:      noarch
 %if %{undefined without_hscolour}
 Requires:       hscolour
@@ -47,14 +48,6 @@ Requires:       %{name} = %{version}-%{release}
 Extra macros used for subpackaging of Haskell libraries,
 for example in ghc and haskell-platform.
 
-%package -n ghc-srpm-macros
-Summary:        RPM macros for building Haskell source packages
-Group:          Development/Libraries/Other
-BuildArch:      noarch
-
-%description -n ghc-srpm-macros
-Macros used when generating source Haskell rpm packages.
-
 %prep
 %setup -q
 
@@ -69,9 +62,9 @@ install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
 install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
 install -p -D -m 0755 cabal-tweak-drop-dep %{buildroot}/%{_bindir}/cabal-tweak-drop-dep
 install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag
+install -p -D -m 0755 cabal-tweak-remove-upperbound %{buildroot}/%{_bindir}/cabal-tweak-remove-upperbound
 install -p -D -m 0755 ghc-pkg-wrapper %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
-install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
 
 %files
@@ -83,9 +76,9 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
 %{_bindir}/cabal-tweak-dep-ver
 %{_bindir}/cabal-tweak-flag
 %{_bindir}/cabal-tweak-drop-dep
+%{_bindir}/cabal-tweak-remove-upperbound
 %{_prefix}/lib/rpm/ghc-pkg-wrapper
 %{_prefix}/lib/rpm/fileattrs/ghc.attr
-%{_prefix}/lib/rpm/ghc-dirs.sh
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Setup.hs