move agda and data to base package, dropping common
This commit is contained in:
parent
0c769109ae
commit
c4c53b3fea
43
Agda.spec
43
Agda.spec
@ -19,7 +19,7 @@
|
||||
Name: %{pkg_name}
|
||||
Version: 2.6.0.1
|
||||
# can only be reset when all subpkgs bumped
|
||||
Release: 21%{?dist}
|
||||
Release: 22%{?dist}
|
||||
Summary: A dependently typed functional programming language and proof assistant
|
||||
|
||||
License: MIT and BSD
|
||||
@ -77,7 +77,7 @@ BuildRequires: ghc-unordered-containers-prof
|
||||
BuildRequires: ghc-zlib-prof
|
||||
BuildRequires: alex
|
||||
BuildRequires: happy
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Obsoletes: %{name}-common < %{version}-%{release}
|
||||
# for missing dep 'EdisonCore':
|
||||
BuildRequires: ghc-QuickCheck-prof
|
||||
# for missing dep 'uri-encode':
|
||||
@ -88,7 +88,6 @@ BuildRequires: emacs(bin)
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=991929
|
||||
ExcludeArch: %{arm}
|
||||
|
||||
Requires: ghc-%{name}-devel = %{version}-%{release}
|
||||
# introduced for F23
|
||||
Obsoletes: emacs-agda-el < 2.4.2.2-5
|
||||
Provides: emacs-agda = %{version}-%{release}
|
||||
@ -107,17 +106,8 @@ the Swedish logician Per Martin-Löf. It has many similarities with other
|
||||
proof assistants based on dependent types, such as Coq, Epigram and NuPRL.
|
||||
|
||||
|
||||
%package common
|
||||
Summary: %{name} common files
|
||||
BuildArch: noarch
|
||||
|
||||
%description common
|
||||
This package provides the %{name} common data files.
|
||||
|
||||
|
||||
%package -n ghc-%{name}
|
||||
Summary: Haskell %{name} library
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
|
||||
%description -n ghc-%{name}
|
||||
This package provides the Haskell %{name} shared library.
|
||||
@ -215,7 +205,6 @@ cd -
|
||||
%ghc_libs_install %{subpkgs}
|
||||
%ghc_lib_install
|
||||
%ghc_fix_rpath %{pkgver}
|
||||
mv %{buildroot}%{_ghcdocdir}{,-common}
|
||||
# End cabal-rpm install
|
||||
|
||||
for i in $(find %{buildroot}%{_datadir}/%{pkgver} -name "*.agda"); do
|
||||
@ -234,17 +223,11 @@ rm %{buildroot}%{_bindir}/agda-mode
|
||||
rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
|
||||
|
||||
%if 0%{?fedora} < 31 || 0%{?rhel} < 8
|
||||
%post -n ghc-%{name}-devel
|
||||
%ghc_pkg_recache
|
||||
|
||||
|
||||
%postun -n ghc-%{name}-devel
|
||||
%ghc_pkg_recache
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc CHANGELOG.md README.md
|
||||
%{_bindir}/agda
|
||||
%{_datadir}/%{pkgver}
|
||||
# Begin cabal-rpm files:
|
||||
%dir %{_emacs_sitelispdir}/agda
|
||||
%{_emacs_sitelispdir}/agda/*.el
|
||||
@ -252,16 +235,8 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
%{_emacs_sitestartdir}/*.el
|
||||
|
||||
|
||||
%files common
|
||||
# Begin cabal-rpm files:
|
||||
%license LICENSE
|
||||
%doc CHANGELOG.md README.md
|
||||
%{_datadir}/%{pkgver}
|
||||
# End cabal-rpm files
|
||||
|
||||
|
||||
%files -n ghc-%{name} -f ghc-%{name}.files
|
||||
%{_bindir}/agda
|
||||
%license LICENSE
|
||||
|
||||
|
||||
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
|
||||
@ -279,6 +254,10 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 27 2020 Jens Petersen <petersen@redhat.com> - 2.6.0.1-22
|
||||
- move statically linked /usr/bin/agda and datadir into base package
|
||||
- also drop common subpackage
|
||||
|
||||
* Thu Feb 20 2020 Jens Petersen <petersen@redhat.com> - 2.6.0.1-21
|
||||
- refresh to cabal-rpm-2.0.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user