build subpackage inside main package
This commit is contained in:
parent
108650930d
commit
d76f81bcf8
28
Agda.spec
28
Agda.spec
@ -12,7 +12,7 @@
|
||||
|
||||
Name: %{pkg_name}
|
||||
Version: 2.4.2.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: A dependently typed functional programming language and proof assistant
|
||||
|
||||
License: MIT and BSD
|
||||
@ -114,14 +114,13 @@ This package provides the Haskell %{name} library development files.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pkgver} -b2
|
||||
%setup -q -n %{pkgver} -a2
|
||||
%patch1 -p1 -b .orig
|
||||
cabal-tweak-dep-ver cpphs '< 1.20' '<1.21'
|
||||
cd ..
|
||||
|
||||
# tweak the Agda version in the emacs mode
|
||||
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!"
|
||||
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
|
||||
fi
|
||||
|
||||
@ -129,9 +128,8 @@ fi
|
||||
%build
|
||||
%define elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-queue.el agda2-mode.el agda2.el
|
||||
|
||||
cd ..
|
||||
# check no missing new elisp files
|
||||
cd %{pkgver}/src/data/emacs-mode
|
||||
cd src/data/emacs-mode
|
||||
for i in *.el; do
|
||||
if ! echo %{elisp_files} | grep -q $i; then
|
||||
echo "$i missing from %%elisp_files - aborting!"
|
||||
@ -142,14 +140,15 @@ cd -
|
||||
|
||||
# cpphs: src/full/Agda/Interaction/BasicOps.hs: hGetContents: invalid argument (invalid byte sequence)
|
||||
LANG=en_US.utf8
|
||||
%ghc_libs_build %{geniplate} %{pkgver}
|
||||
%ghc_libs_build %{geniplate}
|
||||
%ghc_lib_build
|
||||
|
||||
# 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 %{pkgver}/src/data/emacs-mode
|
||||
cd src/data/emacs-mode
|
||||
for i in %elisp_files; do
|
||||
%{_emacs_bytecompile} $i
|
||||
done
|
||||
@ -157,11 +156,11 @@ cd -
|
||||
|
||||
|
||||
%install
|
||||
cd ..
|
||||
%ghc_libs_install %{geniplate} %{pkgver}
|
||||
%ghc_libs_install %{geniplate}
|
||||
%ghc_lib_install
|
||||
|
||||
mkdir -p %{buildroot}%{_emacs_sitelispdir}/agda
|
||||
for i in %{pkgver}/src/data/emacs-mode/*; do
|
||||
for i in src/data/emacs-mode/*; do
|
||||
install -p -m 0644 $i %{buildroot}%{_emacs_sitelispdir}/agda
|
||||
done
|
||||
|
||||
@ -171,6 +170,8 @@ install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir}
|
||||
rm %{buildroot}%{_bindir}/agda-mode
|
||||
rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
|
||||
mv %{buildroot}%{_defaultlicensedir}/{,ghc-}%{name}
|
||||
|
||||
|
||||
%post -n ghc-%{name}
|
||||
%{_bindir}/agda %{_datadir}/%{name}-%{version}/lib/prim/Agda/Primitive.agda || :
|
||||
@ -204,6 +205,9 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 9 2017 Jens Petersen <petersen@redhat.com> - 2.4.2.5-2
|
||||
- build subpackage inside main package
|
||||
|
||||
* Thu Oct 6 2016 Jens Petersen <petersen@redhat.com> - 2.4.2.5-1
|
||||
- update to 2.4.2.5
|
||||
- subpackage new dep geniplate-mirror
|
||||
|
Loading…
Reference in New Issue
Block a user