uri-encode has been packaged
This commit is contained in:
parent
e0dc3e1641
commit
2869a2b3a9
19
Agda.spec
19
Agda.spec
@ -11,13 +11,12 @@
|
||||
|
||||
%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 %{geniplatemirror} %{murmurhash} %{uriencode}
|
||||
%global subpkgs %{geniplatemirror} %{murmurhash}
|
||||
|
||||
Name: %{pkg_name}
|
||||
Version: 2.6.1
|
||||
# can only be reset when all subpkgs bumped
|
||||
Release: 27%{?dist}
|
||||
Release: 28%{?dist}
|
||||
Summary: A dependently typed functional programming language and proof assistant
|
||||
|
||||
License: MIT and BSD
|
||||
@ -26,7 +25,6 @@ Url: https://hackage.haskell.org/package/%{name}
|
||||
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.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
|
||||
|
||||
@ -69,14 +67,11 @@ 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 'uri-encode':
|
||||
BuildRequires: ghc-network-uri-prof
|
||||
BuildRequires: ghc-utf8-string-prof
|
||||
# End cabal-rpm deps
|
||||
BuildRequires: emacs(bin)
|
||||
|
||||
@ -144,7 +139,6 @@ This package provides the Haskell %{name} profiling library.
|
||||
%if %{defined ghclibdir}
|
||||
%ghc_lib_subpackage %{geniplatemirror}
|
||||
%ghc_lib_subpackage %{murmurhash}
|
||||
%ghc_lib_subpackage %{uriencode}
|
||||
%endif
|
||||
|
||||
%global version %{main_version}
|
||||
@ -152,13 +146,13 @@ This package provides the Haskell %{name} profiling library.
|
||||
|
||||
%prep
|
||||
# Begin cabal-rpm setup:
|
||||
%setup -q -a1 -a2 -a3
|
||||
%setup -q -a1 -a2
|
||||
# End cabal-rpm setup
|
||||
(
|
||||
cd %{geniplatemirror}
|
||||
cabal-tweak-dep-ver template-haskell '< 2.14' '< 3'
|
||||
)
|
||||
# tweak the Agda version in the emacs mode
|
||||
# check the Agda version in the emacs mode
|
||||
if ! grep -q \"%{version}\" src/data/emacs-mode/agda2-mode.el; then
|
||||
echo "agda2-version in src/data/emacs-mode/agda2-mode.el out of sync!"
|
||||
exit 1
|
||||
@ -251,6 +245,9 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 1 2020 Jens Petersen <petersen@redhat.com> - 2.6.1-28
|
||||
- uri-encode has been packaged
|
||||
|
||||
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-27
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user