update to 1.0.27

refresh to cabal-rpm-2.1.0 with SPDX migration
This commit is contained in:
Jens Petersen 2023-01-22 23:40:23 +08:00
parent 4a425ca69c
commit be8a3331f1
4 changed files with 24 additions and 45 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/gi-harfbuzz-0.0.3.tar.gz
/gi-pango-1.0.24.tar.gz
/gi-harfbuzz-0.0.4.tar.gz
/gi-pango-1.0.27.tar.gz

View File

@ -1,24 +1,36 @@
# generated by cabal-rpm-2.0.10
# generated by cabal-rpm-2.1.0
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name gi-pango
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
Version: 1.0.24
Release: 5%{?dist}
Version: 1.0.27
Release: 1%{?dist}
Summary: Pango bindings
License: LGPLv2+
License: LGPL-2.1-or-later
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
Patch0: gi-pango-1.0.24-require-gi-gio.patch
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-gi-gio-devel
BuildRequires: ghc-gi-glib-devel
BuildRequires: ghc-gi-gobject-devel
BuildRequires: ghc-gi-harfbuzz-devel
BuildRequires: ghc-haskell-gi-devel
BuildRequires: ghc-haskell-gi-base-devel
BuildRequires: ghc-haskell-gi-overloading-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-transformers-devel
%if %{with ghc_prof}
BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-prof
@ -28,9 +40,9 @@ BuildRequires: ghc-gi-gobject-prof
BuildRequires: ghc-gi-harfbuzz-prof
BuildRequires: ghc-haskell-gi-prof
BuildRequires: ghc-haskell-gi-base-prof
BuildRequires: ghc-haskell-gi-overloading-devel
BuildRequires: ghc-text-prof
BuildRequires: ghc-transformers-prof
%endif
BuildRequires: pkgconfig(pango)
# End cabal-rpm deps
BuildRequires: cairo-gobject-devel
@ -81,7 +93,6 @@ This package provides the Haskell %{pkg_name} profiling library.
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
# End cabal-rpm setup
%patch0 -p1 -b .orig
%build
@ -122,6 +133,10 @@ This package provides the Haskell %{pkg_name} profiling library.
%changelog
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 1.0.27-1
- https://hackage.haskell.org/package/gi-pango-1.0.27/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Tue Aug 2 2022 Jens Petersen <petersen@redhat.com> - 1.0.24-5
- backport gi-gio depends change from 1.0.26

View File

@ -1,36 +0,0 @@
diff -ur gi-pango-1.0.25/Setup.hs gi-pango-1.0.26/Setup.hs
--- gi-pango-1.0.25/Setup.hs 2001-09-09 09:46:40.000000000 +0800
+++ gi-pango-1.0.26/Setup.hs 2001-09-09 09:46:40.000000000 +0800
@@ -4,6 +4,7 @@
import qualified GI.GLib.Config as GLib
import qualified GI.GObject.Config as GObject
+import qualified GI.Gio.Config as Gio
import qualified GI.HarfBuzz.Config as HarfBuzz
@@ -12,4 +13,4 @@
overridesFile = Just "Pango.overrides"
verbose = False
outputDir = Nothing
- inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:HarfBuzz" HarfBuzz.overrides]
+ inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:Gio" Gio.overrides, TaggedOverride "inherited:HarfBuzz" HarfBuzz.overrides]
diff -ur gi-pango-1.0.25/gi-pango.cabal gi-pango-1.0.26/gi-pango.cabal
--- gi-pango-1.0.25/gi-pango.cabal 2022-08-02 11:14:32.086149902 +0800
+++ gi-pango-1.0.26/gi-pango.cabal 2022-08-02 11:14:21.728096524 +0800
@@ -18,6 +18,7 @@
Cabal >= 1.24,
haskell-gi >= 0.25 && < 0.26,
gi-gobject == 2.0.*,
+ gi-gio == 2.0.*,
gi-glib == 2.0.*,
gi-harfbuzz == 0.0.*
@@ -33,6 +34,7 @@
haskell-gi >= 0.25 && < 0.26,
haskell-gi-overloading < 1.1,
gi-gobject == 2.0.*,
+ gi-gio == 2.0.*,
gi-glib == 2.0.*,
gi-harfbuzz == 0.0.*,
bytestring >= 0.10 && < 1,

View File

@ -1,2 +1 @@
SHA512 (gi-pango-1.0.24.tar.gz) = 8d62fcfc3e61c5edcf4551a56f5f257c3d2fcffe39c7c22d0fb1898cafc976fc3f072327a3ec81c38f8070c036710a83c08b2bbd522a0f5e550849b8f38cc5bd
SHA512 (gi-harfbuzz-0.0.4.tar.gz) = d9693a9300d4911f8b616fec857dc84dcac0560332333f834d28eb87cfbfa26260d816ab203e9d8eb0cc45b327980be1363899a436a20efe166afb7d074e8c03
SHA512 (gi-pango-1.0.27.tar.gz) = 7a4ee25ab361049f4647a853a818bfe790367a44b73b1ca39c41778fc88f630d39149176afca00767dfbb91e773fa8d7274304a8d8f4e8db0bb89b97fc5fb8a9