From 253d8eaad64043a5672f5433562316c2a8521a20 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 26 Dec 2017 10:58:59 +0100 Subject: [PATCH] ieee754 is now a separate package --- Agda.spec | 27 +++++++++++++++------------ sources | 1 - 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Agda.spec b/Agda.spec index 6e6d1c0..8e4e7f6 100644 --- a/Agda.spec +++ b/Agda.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name Agda @@ -7,15 +7,14 @@ %global EdisonAPI EdisonAPI-1.3.1 %global EdisonCore EdisonCore-1.3.1.1 %global geniplatemirror geniplate-mirror-0.7.5 -%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} %{ieee754} %{monadplus} %{murmurhash} +%global subpkgs %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{monadplus} %{murmurhash} Name: %{pkg_name} Version: 2.5.2 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: A dependently typed functional programming language and proof assistant License: MIT and BSD @@ -23,10 +22,9 @@ 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/%{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 +Source3: https://hackage.haskell.org/package/%{monadplus}/%{monadplus}.tar.gz +Source4: https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz +Source5: https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.tar.gz Source10: agda-mode-init.el BuildRequires: ghc-Cabal-devel @@ -52,7 +50,7 @@ BuildRequires: ghc-gitrev-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashtables-devel BuildRequires: ghc-haskeline-devel -#BuildRequires: ghc-ieee754-devel +BuildRequires: ghc-ieee754-devel #BuildRequires: ghc-monadplus-devel BuildRequires: ghc-mtl-devel #BuildRequires: ghc-murmur-hash-devel @@ -106,9 +104,12 @@ This package provides the Haskell %{name} shared library. %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files Provides: ghc-%{name}-static = %{version}-%{release} +Provides: ghc-%{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: ghc-%{name}%{?_isa} = %{version}-%{release} Obsoletes: Agda < 2.3.1 @@ -122,7 +123,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 %{ieee754} %ghc_lib_subpackage %{monadplus} %ghc_lib_subpackage %{murmurhash} %endif @@ -131,7 +131,7 @@ This package provides the Haskell %{name} library development files. %prep -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 +%setup -q -a1 -a2 -a3 -a4 -a5 cabal-tweak-dep-ver ieee754 '< 0.8' '< 0.9' # tweak the Agda version in the emacs mode @@ -193,7 +193,7 @@ install -p -m 0644 %SOURCE10 %{buildroot}%{_emacs_sitestartdir} rm %{buildroot}%{_bindir}/agda-mode rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode -mv %{buildroot}%{_defaultlicensedir}/{,ghc-}%{name} +mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name} %post -n ghc-%{name}-devel @@ -223,6 +223,9 @@ mv %{buildroot}%{_defaultlicensedir}/{,ghc-}%{name} %changelog +* Tue Dec 26 2017 Jens Petersen - 2.5.2-10 +- ieee754 is now a separate package + * Wed Nov 15 2017 Jens Petersen - 2.5.2-9 - gitrev is now packaged in Fedora diff --git a/sources b/sources index 4a7dd7a..c0f2054 100644 --- a/sources +++ b/sources @@ -2,6 +2,5 @@ SHA512 (geniplate-mirror-0.7.5.tar.gz) = c5ca8c9de5e4ba00e45fbb3e1a2510cb02b6fe9 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 -SHA512 (ieee754-0.8.0.tar.gz) = d75b619f0c0b9ac496a68997b6d79b3d7504221f1583e7c35ecc035b6e2b11559e402264f36827153aa89d9eabb27d9383413eb5fd157385b3f41c4f0050a43b SHA512 (EdisonCore-1.3.1.1.tar.gz) = 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8 SHA512 (Agda-2.5.2.tar.gz) = 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164