update to 0.1.40.1
refresh to cabal-rpm-2.1.0 with SPDX migration
This commit is contained in:
parent
29a5bc767b
commit
5c7519e741
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/hgettext-0.1.30.tar.gz
|
/hgettext-0.1.30.tar.gz
|
||||||
/hgettext-0.1.31.0.tar.gz
|
/hgettext-0.1.31.0.tar.gz
|
||||||
|
/hgettext-0.1.40.1.tar.gz
|
||||||
|
@ -1,34 +1,50 @@
|
|||||||
# generated by cabal-rpm-2.0.9
|
# generated by cabal-rpm-2.1.0
|
||||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
|
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
|
||||||
|
|
||||||
%global pkg_name hgettext
|
%global pkg_name hgettext
|
||||||
%global pkgver %{pkg_name}-%{version}
|
%global pkgver %{pkg_name}-%{version}
|
||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.1.31.0
|
Version: 0.1.40.1
|
||||||
Release: 18%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Haskell binding to libintl
|
Summary: Haskell binding to libintl
|
||||||
|
|
||||||
License: BSD
|
License: BSD-3-Clause
|
||||||
Url: https://hackage.haskell.org/package/%{pkg_name}
|
Url: https://hackage.haskell.org/package/%{pkg_name}
|
||||||
# Begin cabal-rpm sources:
|
# Begin cabal-rpm sources:
|
||||||
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
||||||
Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
|
|
||||||
# End cabal-rpm sources
|
# End cabal-rpm sources
|
||||||
Patch1: https://patch-diff.githubusercontent.com/raw/haskell-hvr/hgettext/pull/16.patch#/hgettext-Cabal-2.4.patch
|
|
||||||
|
|
||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
|
BuildRequires: ghc-Cabal-devel
|
||||||
|
BuildRequires: ghc-base-devel
|
||||||
|
BuildRequires: ghc-containers-devel
|
||||||
|
BuildRequires: ghc-cpphs-devel
|
||||||
|
BuildRequires: ghc-deepseq-devel
|
||||||
|
BuildRequires: ghc-directory-devel
|
||||||
|
BuildRequires: ghc-extra-devel
|
||||||
|
BuildRequires: ghc-filepath-devel
|
||||||
|
BuildRequires: ghc-haskell-src-exts-devel
|
||||||
|
BuildRequires: ghc-process-devel
|
||||||
|
BuildRequires: ghc-setlocale-devel
|
||||||
|
BuildRequires: ghc-split-devel
|
||||||
|
BuildRequires: ghc-uniplate-devel
|
||||||
|
%if %{with ghc_prof}
|
||||||
BuildRequires: ghc-Cabal-prof
|
BuildRequires: ghc-Cabal-prof
|
||||||
BuildRequires: ghc-base-prof
|
BuildRequires: ghc-base-prof
|
||||||
BuildRequires: ghc-containers-prof
|
BuildRequires: ghc-containers-prof
|
||||||
|
BuildRequires: ghc-cpphs-prof
|
||||||
BuildRequires: ghc-deepseq-prof
|
BuildRequires: ghc-deepseq-prof
|
||||||
BuildRequires: ghc-directory-prof
|
BuildRequires: ghc-directory-prof
|
||||||
|
BuildRequires: ghc-extra-prof
|
||||||
BuildRequires: ghc-filepath-prof
|
BuildRequires: ghc-filepath-prof
|
||||||
BuildRequires: ghc-haskell-src-exts-prof
|
BuildRequires: ghc-haskell-src-exts-prof
|
||||||
BuildRequires: ghc-process-prof
|
BuildRequires: ghc-process-prof
|
||||||
BuildRequires: ghc-setlocale-prof
|
BuildRequires: ghc-setlocale-prof
|
||||||
|
BuildRequires: ghc-split-prof
|
||||||
BuildRequires: ghc-uniplate-prof
|
BuildRequires: ghc-uniplate-prof
|
||||||
|
%endif
|
||||||
# End cabal-rpm deps
|
# End cabal-rpm deps
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -80,13 +96,7 @@ This package provides the Haskell %{pkg_name} profiling library.
|
|||||||
%prep
|
%prep
|
||||||
# Begin cabal-rpm setup:
|
# Begin cabal-rpm setup:
|
||||||
%setup -q -n %{pkgver}
|
%setup -q -n %{pkgver}
|
||||||
cp -bp %{SOURCE1} %{pkg_name}.cabal
|
|
||||||
# End cabal-rpm setup
|
# End cabal-rpm setup
|
||||||
%patch1 -p1 -b .orig
|
|
||||||
cabal-tweak-dep-ver base '<4.12' '<5'
|
|
||||||
cabal-tweak-dep-ver Cabal '== 2.2.*' '> 2.2'
|
|
||||||
cabal-tweak-dep-ver containers '<0.6' '<0.7'
|
|
||||||
cabal-tweak-dep-ver haskell-src-exts '<1.21' '<1.24'
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -108,6 +118,7 @@ cabal-tweak-dep-ver haskell-src-exts '<1.21' '<1.24'
|
|||||||
|
|
||||||
|
|
||||||
%files devel -f %{name}-devel.files
|
%files devel -f %{name}-devel.files
|
||||||
|
%doc CHANGELOG.md
|
||||||
%{_bindir}/%{pkg_name}
|
%{_bindir}/%{pkg_name}
|
||||||
|
|
||||||
|
|
||||||
@ -123,6 +134,10 @@ cabal-tweak-dep-ver haskell-src-exts '<1.21' '<1.24'
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.1.40.1-1
|
||||||
|
- https://hackage.haskell.org/package/hgettext-0.1.40.1/changelog
|
||||||
|
- refresh to cabal-rpm-2.1.0 with SPDX migration
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.31.0-18
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.31.0-18
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
@ -1,68 +0,0 @@
|
|||||||
cabal-version: 1.14
|
|
||||||
name: hgettext
|
|
||||||
version: 0.1.31.0
|
|
||||||
x-revision: 1
|
|
||||||
build-type: Simple
|
|
||||||
|
|
||||||
license: BSD3
|
|
||||||
license-file: LICENSE
|
|
||||||
|
|
||||||
author: Vasyl Pasternak
|
|
||||||
maintainer: Herbert Valerio Riedel
|
|
||||||
copyright: 2009 Vasyl Pasternak
|
|
||||||
category: Text
|
|
||||||
bug-reports: https://github.com/hvr/hgettext/issues
|
|
||||||
synopsis: Bindings to libintl.h (gettext, bindtextdomain)
|
|
||||||
description: This package provides bindings to the @gettext@ internationalization and localization (i18n) library.
|
|
||||||
.
|
|
||||||
This package provides support for custom @Setup.hs@ scripts via the "Distribution.Simple.I18N.GetText" module.
|
|
||||||
.
|
|
||||||
A user-contributed tutorial can be found in the [Haskell Wiki](https://wiki.haskell.org/Internationalization_of_Haskell_programs_using_gettext).
|
|
||||||
|
|
||||||
tested-with: GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
|
|
||||||
|
|
||||||
source-repository head
|
|
||||||
type: git
|
|
||||||
location: https://github.com/hvr/hgettext.git
|
|
||||||
|
|
||||||
library
|
|
||||||
default-language: Haskell2010
|
|
||||||
exposed-modules: Text.I18N.GetText,
|
|
||||||
Distribution.Simple.I18N.GetText
|
|
||||||
other-modules: Internal
|
|
||||||
|
|
||||||
hs-source-dirs: src
|
|
||||||
build-depends: base >=4.5 && <4.12
|
|
||||||
, Cabal >=1.14 && <1.25 || == 2.0.* || == 2.2.*
|
|
||||||
, containers >=0.4.2 && <0.6
|
|
||||||
, directory >=1.1 && <1.4
|
|
||||||
, filepath >=1.3 && <1.5
|
|
||||||
, process >=1.1 && <1.7
|
|
||||||
, setlocale >=0.0.3 && <1.1
|
|
||||||
|
|
||||||
ghc-options: -Wall
|
|
||||||
|
|
||||||
-- temporary hack: https://github.com/haskell-hvr/hgettext/pull/3
|
|
||||||
if os(windows)
|
|
||||||
extra-libraries: libintl
|
|
||||||
|
|
||||||
executable hgettext
|
|
||||||
default-language: Haskell2010
|
|
||||||
|
|
||||||
main-is: hgettext.hs
|
|
||||||
other-modules: Paths_hgettext
|
|
||||||
|
|
||||||
hs-source-dirs: src-exe
|
|
||||||
|
|
||||||
-- constraints inherited from lib:hgettext
|
|
||||||
build-depends: hgettext
|
|
||||||
, base
|
|
||||||
, Cabal
|
|
||||||
, containers
|
|
||||||
, filepath
|
|
||||||
|
|
||||||
build-depends: deepseq >=1.1 && <1.5
|
|
||||||
, haskell-src-exts >=1.18 && <1.21
|
|
||||||
, uniplate >=1.6.12 && <1.7
|
|
||||||
|
|
||||||
ghc-options: -Wall
|
|
@ -1,64 +0,0 @@
|
|||||||
From e930c5d0b1d9291f55a4f86d9bcdf51fcdb2cde3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jan Tojnar <jtojnar@gmail.com>
|
|
||||||
Date: Thu, 14 Mar 2019 12:49:07 +0100
|
|
||||||
Subject: [PATCH] Fix build with cabal-2.4
|
|
||||||
|
|
||||||
https://github.com/haskell-hvr/hgettext/issues/15
|
|
||||||
---
|
|
||||||
src/Distribution/Simple/I18N/GetText.hs | 4 ++--
|
|
||||||
src/Internal.hs | 15 ++++++++++++++-
|
|
||||||
2 files changed, 16 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/Distribution/Simple/I18N/GetText.hs b/src/Distribution/Simple/I18N/GetText.hs
|
|
||||||
index f2bc7c8..7f9f8a5 100644
|
|
||||||
--- a/src/Distribution/Simple/I18N/GetText.hs
|
|
||||||
+++ b/src/Distribution/Simple/I18N/GetText.hs
|
|
||||||
@@ -78,7 +78,7 @@ import Distribution.Simple
|
|
||||||
import Distribution.Simple.InstallDirs as I
|
|
||||||
import Distribution.Simple.LocalBuildInfo
|
|
||||||
import Distribution.Simple.Setup
|
|
||||||
-import Distribution.Simple.Utils
|
|
||||||
+import Distribution.Simple.Utils (warn)
|
|
||||||
import Distribution.Verbosity
|
|
||||||
|
|
||||||
import Control.Arrow (second)
|
|
||||||
@@ -90,7 +90,7 @@ import System.Exit
|
|
||||||
import System.FilePath
|
|
||||||
import System.Process
|
|
||||||
|
|
||||||
-import Internal
|
|
||||||
+import Internal (fromPackageName, matchFileGlob)
|
|
||||||
|
|
||||||
-- | Default main function, same as
|
|
||||||
--
|
|
||||||
diff --git a/src/Internal.hs b/src/Internal.hs
|
|
||||||
index 69d3ea2..f1eb255 100644
|
|
||||||
--- a/src/Internal.hs
|
|
||||||
+++ b/src/Internal.hs
|
|
||||||
@@ -1,8 +1,14 @@
|
|
||||||
{-# LANGUAGE CPP #-}
|
|
||||||
|
|
||||||
-module Internal where
|
|
||||||
+module Internal (fromPackageName, matchFileGlob) where
|
|
||||||
|
|
||||||
import Distribution.Simple
|
|
||||||
+#if MIN_VERSION_Cabal(2,4,0)
|
|
||||||
+import Distribution.Simple.Glob (matchDirFileGlob)
|
|
||||||
+import Distribution.Verbosity (silent)
|
|
||||||
+#else
|
|
||||||
+import Distribution.Simple.Utils (matchFileGlob)
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
fromPackageName :: PackageName -> String
|
|
||||||
#if MIN_VERSION_Cabal(2,0,0)
|
|
||||||
@@ -10,3 +16,10 @@ fromPackageName = unPackageName
|
|
||||||
#else
|
|
||||||
fromPackageName (PackageName s) = s
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#if MIN_VERSION_Cabal(2,4,0)
|
|
||||||
+-- | Newer versions of Cabal have removed this function in favour of more configurable implementation
|
|
||||||
+-- We assume Cabal 2.0
|
|
||||||
+matchFileGlob :: FilePath -> IO [FilePath]
|
|
||||||
+matchFileGlob = matchDirFileGlob silent (mkVersion [2, 0]) "."
|
|
||||||
+#endif
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (hgettext-0.1.31.0.tar.gz) = cb8808b9499887ca2ef58454339ff59ffe0aa8f99f2f13fec0e08585244834fb59be19d64459de33ed1bb58d97d55e5fe7e196ff46d3d2b15c598d5f53139cb8
|
SHA512 (hgettext-0.1.40.1.tar.gz) = 2a45a90428456106165f5a1161ab35eb5f888cf8a4870dee2bf97063547319c591927d179d2fe2d4f47d13b6701e6be272fdfa26912df29ec6983c81d7f58961
|
||||||
|
Loading…
Reference in New Issue
Block a user