diff --git a/ghc-rpm-macros-2.5.2.tar.xz b/ghc-rpm-macros-2.5.2.tar.xz deleted file mode 100644 index 4b2a7603a2dd451c3afe907f9c34a6a5d36c9438..0000000000000000000000000000000000000000 Binary files a/ghc-rpm-macros-2.5.2.tar.xz and /dev/null differ diff --git a/ghc-rpm-macros-2.6.4.tar.xz b/ghc-rpm-macros-2.6.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..49986a44dddfdbd56ebbda2e9581e74713dc7bc1 Binary files /dev/null and b/ghc-rpm-macros-2.6.4.tar.xz differ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ae508a394de5b973f3647c4f61703c6b2c57dc3a..801112135be904c93d0b79db10d876b84044e2c3 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 2.5.2 +Version: 2.6.4 Release: 1 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later @@ -26,7 +26,7 @@ for example in ghc and haskell-platform. %prep %setup -q -%patch1 -p1 +%patch -P1 -p1 %build @@ -62,6 +62,10 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %{_rpmmacrodir}/macros.ghc-extra %changelog +* Sun Jul 28 2024 Lin Runze 2.6.4-1 +- Update to 2.6.4 +- Replace %patchN with %patch -P, %patchN is deprecated + * Tue Jul 25 2023 Lin Runze 2.5.2-1 - Initial packaging - Using help suffix instead of doc diff --git a/using-help-as-doc-packages-suffix.patch b/using-help-as-doc-packages-suffix.patch index b995f9bce56e63dd12e72e35bea8265a78ce7044..937218c9a5facbba8cc3081794d4353b2c12b386 100644 --- a/using-help-as-doc-packages-suffix.patch +++ b/using-help-as-doc-packages-suffix.patch @@ -1,7 +1,7 @@ -diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.ghc ---- origin/ghc-rpm-macros-2.5.2/macros.ghc 2023-03-19 08:16:20.000000000 +0800 -+++ ghc-rpm-macros-2.5.2/macros.ghc 2023-09-26 16:30:17.418978816 +0800 -@@ -161,8 +161,8 @@ +diff --color -Naur origin/ghc-rpm-macros-2.6.4/macros.ghc ghc-rpm-macros-2.6.4/macros.ghc +--- origin/ghc-rpm-macros-2.6.4/macros.ghc 2023-11-12 02:28:35.114813076 +0800 ++++ ghc-rpm-macros-2.6.4/macros.ghc 2024-07-28 03:37:59.842776679 +0800 +@@ -159,8 +159,8 @@ exit 1\ fi\ %define basepkg %{ghc_prefix}-%{pkgname}\ @@ -12,7 +12,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh %if 0%{?1:1}\ if [ -d "%{buildroot}%{_ghclicensedir}/%{basepkg}" ]; then\ for i in $(ls %{buildroot}%{_ghclicensedir}/%{basepkg}); do\ -@@ -194,18 +194,18 @@ +@@ -192,18 +192,18 @@ %if %{with haddock}\ haddock_dir=%{ghc_html_libraries_dir}/%{pkgnamever}\ if [ -d %{buildroot}$haddock_dir ]; then\ @@ -34,7 +34,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh if [ -f "$i" ]; then\ sed -i -e "s!%{buildroot}!!g" $i\ fi\ -@@ -217,7 +217,7 @@ +@@ -215,7 +215,7 @@ cat %{name}-%1.files >> %{name}-%2.files\ cat %{name}-%1-devel.files >> %{name}-%2-devel.files\ %if %{with haddock}\ @@ -43,9 +43,9 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh %endif\ %if %{with ghc_prof}\ cat %{name}-%1-prof.files >> %{name}-%2-prof.files\ -diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc-extra ghc-rpm-macros-2.5.2/macros.ghc-extra ---- origin/ghc-rpm-macros-2.5.2/macros.ghc-extra 2023-02-02 23:29:52.000000000 +0800 -+++ ghc-rpm-macros-2.5.2/macros.ghc-extra 2023-09-26 10:29:01.799794938 +0800 +diff --color -Naur origin/ghc-rpm-macros-2.6.4/macros.ghc-extra ghc-rpm-macros-2.6.4/macros.ghc-extra +--- origin/ghc-rpm-macros-2.6.4/macros.ghc-extra 2023-11-11 05:31:02.756300258 +0800 ++++ ghc-rpm-macros-2.6.4/macros.ghc-extra 2024-07-28 03:38:41.772766644 +0800 @@ -48,16 +48,16 @@ \ %if 0%{!-m:1}\ @@ -67,7 +67,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc-extra ghc-rpm-macros-2.5.2/mac This package provides the Haskell %{pkgname} library documentation.\ %endif\ \ -@@ -81,7 +81,7 @@ +@@ -84,7 +84,7 @@ %if 0%{!-m:1}\ \ %if %{with haddock}\