From cdeca6e1e4508fb85bf837e2e6841c23e4ea2853 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Sep 2020 10:35:56 +0800 Subject: [PATCH] uri-encode has been packaged --- Agda.spec | 17 +++++++---------- sources | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Agda.spec b/Agda.spec index a53904e..684b3e9 100644 --- a/Agda.spec +++ b/Agda.spec @@ -13,13 +13,12 @@ %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 %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{murmurhash} Name: %{pkg_name} Version: 2.6.0.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 @@ -30,7 +29,6 @@ Source1: https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.ta 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 # End cabal-rpm sources Source10: agda-mode-init.el @@ -73,16 +71,13 @@ BuildRequires: ghc-text-prof BuildRequires: ghc-time-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-unordered-containers-prof -#BuildRequires: ghc-uri-encode-prof +BuildRequires: ghc-uri-encode-prof 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 # End cabal-rpm deps BuildRequires: emacs(bin) # https://bugzilla.redhat.com/show_bug.cgi?id=991929 @@ -154,7 +149,6 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{EdisonCore} %ghc_lib_subpackage %{geniplatemirror} %ghc_lib_subpackage %{murmurhash} -%ghc_lib_subpackage %{uriencode} %endif %global version %{main_version} @@ -162,7 +156,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 -a4 # End cabal-rpm setup ( cd %{geniplatemirror} @@ -254,6 +248,9 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode %changelog +* Fri Sep 11 2020 Jens Petersen - 2.6.0.1-23 +- uri-encode has been packaged + * Wed May 27 2020 Jens Petersen - 2.6.0.1-22 - move statically linked /usr/bin/agda and datadir into base package - also drop common subpackage diff --git a/sources b/sources index 27fd4d1..03bfc8b 100644 --- a/sources +++ b/sources @@ -3,5 +3,4 @@ SHA512 (EdisonCore-1.3.2.1.tar.gz) = 6812b04edb1abdfc2486d66bb86d6370b76667de160 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