diff --git a/cabal-file-th-0.2.7-readGenericPackageDescription.patch b/cabal-file-th-0.2.7-readGenericPackageDescription.patch new file mode 100644 index 0000000..ecfe0d7 --- /dev/null +++ b/cabal-file-th-0.2.7-readGenericPackageDescription.patch @@ -0,0 +1,14 @@ +--- cabal-file-th-0.2.7/Distribution/PackageDescription/TH.hs~ 2001-09-09 09:46:40.000000000 +0800 ++++ cabal-file-th-0.2.7/Distribution/PackageDescription/TH.hs 2023-08-14 12:37:00.010380276 +0800 +@@ -42,7 +42,11 @@ + -- which was introduced in Cabal-2.0.0.2. + -- readPackageDescription was removed in Cabal-2.2.0.0 + #if MIN_VERSION_Cabal(2,2,0) ++#if MIN_VERSION_Cabal(3,8,0) ++import Distribution.Simple.PackageDescription (readGenericPackageDescription) ++#else + import Distribution.PackageDescription.Parsec (readGenericPackageDescription) ++#endif + readPkgDesc = readGenericPackageDescription + #else + import Distribution.PackageDescription.Parse (readPackageDescription) diff --git a/ghc-cabal-file-th.spec b/ghc-cabal-file-th.spec index 2ed56fd..6d2d448 100644 --- a/ghc-cabal-file-th.spec +++ b/ghc-cabal-file-th.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.1.0 +# generated by cabal-rpm-2.1.2 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name cabal-file-th @@ -10,13 +10,15 @@ Name: ghc-%{pkg_name} Version: 0.2.7 Release: %autorelease -Summary: Template Haskell expressions for reading cabal files +Summary: Template Haskell expressions for reading cabal file fields License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources +# https://github.com/nkpart/cabal-file-th/pull/14 +Patch0: cabal-file-th-0.2.7-readGenericPackageDescription.patch # Begin cabal-rpm deps: BuildRequires: ghc-rpm-macros @@ -76,6 +78,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +%autopatch -p1 # End cabal-rpm setup