use cabal-tweak-dep-ver to bump cpphs
This commit is contained in:
parent
540194fe1a
commit
1bb4e49a1c
@ -1,11 +0,0 @@
|
|||||||
--- Agda-2.4.2.5/Agda.cabal~ 2015-12-19 06:29:26.000000000 +0900
|
|
||||||
+++ Agda-2.4.2.5/Agda.cabal 2016-10-06 11:12:49.315141342 +0900
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
include-dirs: src/full
|
|
||||||
|
|
||||||
if flag(cpphs)
|
|
||||||
- build-tools: cpphs >= 1.19 && < 1.20
|
|
||||||
+ build-tools: cpphs >= 1.19 && < 1.21
|
|
||||||
ghc-options: -pgmP cpphs -optP --cpp
|
|
||||||
|
|
||||||
if os(windows)
|
|
@ -20,7 +20,6 @@ Url: https://hackage.haskell.org/package/%{name}
|
|||||||
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
||||||
Source1: agda-mode-init.el
|
Source1: agda-mode-init.el
|
||||||
Source2: https://hackage.haskell.org/package/%{geniplate}/%{geniplate}.tar.gz
|
Source2: https://hackage.haskell.org/package/%{geniplate}/%{geniplate}.tar.gz
|
||||||
Patch0: Agda-cpphs-version.patch
|
|
||||||
Patch1: Agda-HashMap.patch
|
Patch1: Agda-HashMap.patch
|
||||||
|
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
@ -116,8 +115,10 @@ This package provides the Haskell %{name} library development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c -n %{pkgver} -a2
|
%setup -q -c -n %{pkgver} -a2
|
||||||
%patch0 -b .orig
|
|
||||||
%patch1 -b .orig
|
%patch1 -b .orig
|
||||||
|
cd %{pkgver}
|
||||||
|
cabal-tweak-dep-ver cpphs '< 1.20' '<1.21'
|
||||||
|
cd ..
|
||||||
|
|
||||||
# tweak the Agda version in the emacs mode
|
# tweak the Agda version in the emacs mode
|
||||||
if ! grep -q \"%{version}\" %{pkgver}/src/data/emacs-mode/agda2-mode.el; then
|
if ! grep -q \"%{version}\" %{pkgver}/src/data/emacs-mode/agda2-mode.el; then
|
||||||
@ -205,7 +206,6 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
|||||||
* Thu Oct 6 2016 Jens Petersen <petersen@redhat.com> - 2.4.2.5-1
|
* Thu Oct 6 2016 Jens Petersen <petersen@redhat.com> - 2.4.2.5-1
|
||||||
- update to 2.4.2.5
|
- update to 2.4.2.5
|
||||||
- subpackage new dep geniplate-mirror
|
- subpackage new dep geniplate-mirror
|
||||||
- disable dynlink on aarch64
|
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2.2-6
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2.2-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user