diff --git a/.gitignore b/.gitignore index f86f892..fe39c94 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /Agda-2.3.2.2.tar.gz /Agda-2.4.2.tar.gz /Agda-2.4.2.2.tar.gz +/geniplate-mirror-0.7.4.tar.gz +/Agda-2.4.2.5.tar.gz diff --git a/Agda.spec b/Agda.spec index dbd07c1..ba7d9dc 100644 --- a/Agda.spec +++ b/Agda.spec @@ -1,25 +1,29 @@ +# generated by cabal-rpm-0.10.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name Agda +%global pkgver %{pkg_name}-%{version} +%global geniplate geniplate-mirror-0.7.4 + Name: %{pkg_name} -Version: 2.4.2.2 -Release: 6%{?dist} +Version: 2.4.2.5 +Release: 1%{?dist} Summary: A dependently typed functional programming language and proof assistant License: MIT and BSD Url: https://hackage.haskell.org/package/%{name} -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: agda-mode-init.el +Source2: https://hackage.haskell.org/package/%{geniplate}/%{geniplate}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: alex BuildRequires: chrpath BuildRequires: cpphs -BuildRequires: ghc-QuickCheck-devel >= 2.7.5 -BuildRequires: ghc-STMonadTrans-devel +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-array-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-boxes-devel @@ -28,9 +32,10 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-data-hash-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel +BuildRequires: ghc-edit-distance-devel BuildRequires: ghc-equivalence-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-geniplate-devel +#BuildRequires: ghc-geniplate-mirror-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashtables-devel BuildRequires: ghc-haskeline-devel @@ -43,15 +48,17 @@ BuildRequires: ghc-strict-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-void-devel BuildRequires: ghc-xhtml-devel BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps BuildRequires: emacs(bin) # bug 991929 -ExcludeArch: %{arm} +#ExcludeArch: %{arm} Requires: ghc-%{name}-devel = %{version}-%{release} # introduced for F23 @@ -92,12 +99,21 @@ Obsoletes: Agda < 2.3.1 This package provides the Haskell %{name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{geniplate} +%endif + +%global version %{main_version} + + %prep -%setup -q +%setup -q -c -n %{pkgver} -a2 # tweak 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!" +if ! grep -q \"%{version}\" %{pkgver}/src/data/emacs-mode/agda2-mode.el; then + echo "agda2-version in %{pkgver}/src/data/emacs-mode/agda2-mode.el out of sync!" exit 1 fi @@ -106,7 +122,7 @@ fi %define elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-queue.el agda2-mode.el agda2.el # check no missing new elisp files -cd src/data/emacs-mode +cd %{pkgver}/src/data/emacs-mode for i in *.el; do if ! echo %{elisp_files} | grep -q $i; then echo "$i missing from %%elisp_files - aborting!" @@ -117,14 +133,14 @@ cd - # cpphs: src/full/Agda/Interaction/BasicOps.hs: hGetContents: invalid argument (invalid byte sequence) LANG=en_US.utf8 -%ghc_lib_build +%ghc_libs_build %{geniplate} %{pkgver} # el6 macro does not add "." to load-path %if %{defined el6} %define _emacs_bytecompile /usr/bin/emacs -batch --no-init-file --no-site-file --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile %endif -cd src/data/emacs-mode +cd %{pkgver}/src/data/emacs-mode for i in %elisp_files; do %{_emacs_bytecompile} $i done @@ -132,12 +148,10 @@ cd - %install -%ghc_lib_install - -%ghc_fix_dynamic_rpath agda +%ghc_libs_install %{geniplate} %{pkgver} mkdir -p %{buildroot}%{_emacs_sitelispdir}/agda -for i in src/data/emacs-mode/*; do +for i in %{pkgver}/src/data/emacs-mode/*; do install -p -m 0644 $i %{buildroot}%{_emacs_sitelispdir}/agda done @@ -145,8 +159,8 @@ mkdir -p %{buildroot}%{_emacs_sitestartdir} install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir} rm %{buildroot}%{_bindir}/agda-mode -rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/EpicInclude -rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/emacs-mode +rm -r %{buildroot}%{_datadir}/%{pkgver}/EpicInclude +rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode %post -n ghc-%{name} @@ -181,6 +195,10 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/emacs-mode %changelog +* Thu Oct 6 2016 Jens Petersen - 2.4.2.5-1 +- update to 2.4.2.5 +- subpackage new dep geniplate-mirror + * Wed Feb 03 2016 Fedora Release Engineering - 2.4.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d1621b7..b26e20d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -3608c4305d32af66807c8189ffc719f5 Agda-2.4.2.2.tar.gz +42ddbc4da5d6dc4d6575fe16dffade91 geniplate-mirror-0.7.4.tar.gz +225633ca20a33c099d8490987392513d Agda-2.4.2.5.tar.gz