update to 2.6.1

This commit is contained in:
Jens Petersen 2020-06-07 23:39:51 +08:00
parent 36e744de86
commit a122f588a5
3 changed files with 14 additions and 19 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/geniplate-mirror-0.7.6.tar.gz
/Agda-2.5.4.2.tar.gz
/Agda-2.6.0.1.tar.gz
/Agda-2.6.1.tar.gz

View File

@ -9,35 +9,30 @@
%global pkg_name Agda
%global pkgver %{pkg_name}-%{version}
%global EdisonAPI EdisonAPI-1.3.1
%global EdisonCore EdisonCore-1.3.2.1
%global geniplatemirror geniplate-mirror-0.7.6
%global murmurhash murmur-hash-0.1.0.9
%global uriencode uri-encode-1.5.0.5
%global subpkgs %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{murmurhash} %{uriencode}
%global subpkgs %{geniplatemirror} %{murmurhash} %{uriencode}
Name: %{pkg_name}
Version: 2.6.0.1
Version: 2.6.1
# can only be reset when all subpkgs bumped
Release: 22%{?dist}
Release: 23%{?dist}
Summary: A dependently typed functional programming language and proof assistant
License: MIT and BSD
Url: https://hackage.haskell.org/package/%{name}
# Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.tar.gz
Source2: https://hackage.haskell.org/package/%{EdisonCore}/%{EdisonCore}.tar.gz
Source3: https://hackage.haskell.org/package/%{geniplatemirror}/%{geniplatemirror}.tar.gz
Source4: https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz
Source5: https://hackage.haskell.org/package/%{uriencode}/%{uriencode}.tar.gz
Source1: https://hackage.haskell.org/package/%{geniplatemirror}/%{geniplatemirror}.tar.gz
Source2: https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz
Source3: https://hackage.haskell.org/package/%{uriencode}/%{uriencode}.tar.gz
# End cabal-rpm sources
Source10: agda-mode-init.el
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
#BuildRequires: ghc-EdisonCore-prof
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-array-prof
BuildRequires: ghc-async-prof
@ -55,6 +50,7 @@ BuildRequires: ghc-equivalence-prof
BuildRequires: ghc-exceptions-prof
BuildRequires: ghc-filepath-prof
#BuildRequires: ghc-geniplate-mirror-prof
BuildRequires: ghc-ghc-compact-prof
BuildRequires: ghc-gitrev-prof
BuildRequires: ghc-hashable-prof
BuildRequires: ghc-hashtables-prof
@ -78,8 +74,6 @@ BuildRequires: ghc-zlib-prof
BuildRequires: alex
BuildRequires: happy
Obsoletes: %{name}-common < %{version}-%{release}
# for missing dep 'EdisonCore':
BuildRequires: ghc-QuickCheck-prof
# for missing dep 'uri-encode':
BuildRequires: ghc-network-uri-prof
BuildRequires: ghc-utf8-string-prof
@ -150,8 +144,6 @@ This package provides the Haskell %{name} profiling library.
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{EdisonAPI}
%ghc_lib_subpackage %{EdisonCore}
%ghc_lib_subpackage %{geniplatemirror}
%ghc_lib_subpackage %{murmurhash}
%ghc_lib_subpackage %{uriencode}
@ -162,7 +154,7 @@ This package provides the Haskell %{name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -a1 -a2 -a3 -a4 -a5
%setup -q -a1 -a2 -a3
# End cabal-rpm setup
(
cd %{geniplatemirror}
@ -254,6 +246,10 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
%changelog
* Sun Jun 07 2020 Jens Petersen <petersen@redhat.com> - 2.6.1-23
- update to 2.6.1
- drop EdisonCore and EdisonAPI deps
* Wed May 27 2020 Jens Petersen <petersen@redhat.com> - 2.6.0.1-22
- move statically linked /usr/bin/agda and datadir into base package
- also drop common subpackage

View File

@ -1,7 +1,5 @@
SHA512 (EdisonAPI-1.3.1.tar.gz) = 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42
SHA512 (EdisonCore-1.3.2.1.tar.gz) = 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
SHA512 (geniplate-mirror-0.7.6.tar.gz) = e75f42524d76f02f2dd66ca240ec4b2711445d7ce2b314bf2a487c61927707960ae74023faab3b539294d4afb66b0381462dd9ed0d1bca5a70f21e5d12d11f5d
SHA512 (monadplus-1.4.2.tar.gz) = 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
SHA512 (murmur-hash-0.1.0.9.tar.gz) = 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486
SHA512 (uri-encode-1.5.0.5.tar.gz) = 1ad0fb5144b93dce50ffaf99a84ba2fe8c05508866fb374d62b75c4a32b58f3c97d7ec30257eec29973ad15fde4e902286e86a41ee36e62b00e00d941e181885
SHA512 (Agda-2.6.0.1.tar.gz) = 90d5e4939f2ca373b5b2aa2809ea97e7e4ec5ffdbf864dd1b0fe24d8a8971e7e599b03896315c82f7d57f24fcf7c694f6b06595cda26be3afee0fa15a72c3c35
SHA512 (Agda-2.6.1.tar.gz) = a499e020f474fa2217bcabbe7fdfe05b2deca6915b284703e1af0e06a9b519028a073ed32b67648c95ce8352bb0a0cc7997d1cd3f6a18372633143d0d18d4867