From 4feb7091aa5597f8a5ab900e1eab6938b5ac2f3b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Feb 2017 13:43:01 +0900 Subject: [PATCH] refresh packaging --- Agda.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Agda.spec b/Agda.spec index 62d71ac..ea9b152 100644 --- a/Agda.spec +++ b/Agda.spec @@ -1,10 +1,11 @@ -# generated by cabal-rpm-0.10.1 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name Agda - %global pkgver %{pkg_name}-%{version} -%global geniplate geniplate-mirror-0.7.4 + +%global geniplatemirror geniplate-mirror-0.7.4 +%global subpkgs %{equivalence} %{geniplatemirror} %ifarch aarch64 %define ghc_without_dynamic yes @@ -19,7 +20,7 @@ License: MIT and BSD Url: https://hackage.haskell.org/package/%{name} 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 +Source2: https://hackage.haskell.org/package/%{geniplatemirror}/%{geniplatemirror}.tar.gz Patch1: Agda-HashMap.patch BuildRequires: ghc-Cabal-devel @@ -56,7 +57,6 @@ 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 @@ -107,7 +107,7 @@ This package provides the Haskell %{name} library development files. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{geniplate} +%ghc_lib_subpackage %{geniplatemirror} %endif %global version %{main_version} @@ -138,9 +138,7 @@ for i in *.el; do done cd - -# cpphs: src/full/Agda/Interaction/BasicOps.hs: hGetContents: invalid argument (invalid byte sequence) -LANG=en_US.utf8 -%ghc_libs_build %{geniplate} +%ghc_libs_build %{subpkgs} %ghc_lib_build # el6 macro does not add "." to load-path @@ -156,8 +154,9 @@ cd - %install -%ghc_libs_install %{geniplate} +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} %{subpkgs} mkdir -p %{buildroot}%{_emacs_sitelispdir}/agda for i in src/data/emacs-mode/*; do