diff --git a/Agda.spec b/Agda.spec index 514f859..6e6d1c0 100644 --- a/Agda.spec +++ b/Agda.spec @@ -7,17 +7,15 @@ %global EdisonAPI EdisonAPI-1.3.1 %global EdisonCore EdisonCore-1.3.1.1 %global geniplatemirror geniplate-mirror-0.7.5 -# https://bugzilla.redhat.com/show_bug.cgi?id=1511751 -%global gitrev gitrev-1.3.1 %global ieee754 ieee754-0.8.0 %global monadplus monadplus-1.4.2 %global murmurhash murmur-hash-0.1.0.9 -%global subpkgs %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{gitrev} %{ieee754} %{monadplus} %{murmurhash} +%global subpkgs %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{ieee754} %{monadplus} %{murmurhash} Name: %{pkg_name} Version: 2.5.2 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: A dependently typed functional programming language and proof assistant License: MIT and BSD @@ -25,11 +23,10 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{EdisonCore}/%{EdisonCore}.tar.gz Source2: https://hackage.haskell.org/package/%{geniplatemirror}/%{geniplatemirror}.tar.gz -Source3: https://hackage.haskell.org/package/%{gitrev}/%{gitrev}.tar.gz -Source4: https://hackage.haskell.org/package/%{ieee754}/%{ieee754}.tar.gz -Source5: https://hackage.haskell.org/package/%{monadplus}/%{monadplus}.tar.gz -Source6: https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz -Source7: https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.tar.gz +Source3: https://hackage.haskell.org/package/%{ieee754}/%{ieee754}.tar.gz +Source4: https://hackage.haskell.org/package/%{monadplus}/%{monadplus}.tar.gz +Source5: https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz +Source6: https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.tar.gz Source10: agda-mode-init.el BuildRequires: ghc-Cabal-devel @@ -51,7 +48,7 @@ BuildRequires: ghc-edit-distance-devel BuildRequires: ghc-equivalence-devel BuildRequires: ghc-filepath-devel #BuildRequires: ghc-geniplate-mirror-devel -#BuildRequires: ghc-gitrev-devel +BuildRequires: ghc-gitrev-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashtables-devel BuildRequires: ghc-haskeline-devel @@ -77,8 +74,6 @@ BuildRequires: happy BuildRequires: emacs(bin) # EdisonCore needs BuildRequires: ghc-QuickCheck-devel -# gitrev needs -BuildRequires: ghc-base-compat-devel # https://bugzilla.redhat.com/show_bug.cgi?id=991929 ExcludeArch: %{arm} @@ -127,7 +122,6 @@ This package provides the Haskell %{name} library development files. %ghc_lib_subpackage %{EdisonAPI} %ghc_lib_subpackage %{EdisonCore} %ghc_lib_subpackage %{geniplatemirror} -%ghc_lib_subpackage %{gitrev} %ghc_lib_subpackage %{ieee754} %ghc_lib_subpackage %{monadplus} %ghc_lib_subpackage %{murmurhash} @@ -137,7 +131,7 @@ This package provides the Haskell %{name} library development files. %prep -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 cabal-tweak-dep-ver ieee754 '< 0.8' '< 0.9' # tweak the Agda version in the emacs mode @@ -229,6 +223,9 @@ mv %{buildroot}%{_defaultlicensedir}/{,ghc-}%{name} %changelog +* Wed Nov 15 2017 Jens Petersen - 2.5.2-9 +- gitrev is now packaged in Fedora + * Fri Nov 10 2017 Jens Petersen - 2.5.2-8 - geniplate-mirror-0.7.5 - gitrev-1.3.1 (#1511680) diff --git a/sources b/sources index 62c11ab..4a7dd7a 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ SHA512 (geniplate-mirror-0.7.5.tar.gz) = c5ca8c9de5e4ba00e45fbb3e1a2510cb02b6fe9fc1447ab0e40f70ff2a9c93234b1e114816a8cde3f8adffa63e830e8d5ced70a71863c357663e10632e372eac -SHA512 (gitrev-1.3.1.tar.gz) = 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd SHA512 (EdisonAPI-1.3.1.tar.gz) = 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42 SHA512 (murmur-hash-0.1.0.9.tar.gz) = 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486 SHA512 (monadplus-1.4.2.tar.gz) = 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539