diff --git a/Agda.spec b/Agda.spec index 8903c1e..c85a468 100644 --- a/Agda.spec +++ b/Agda.spec @@ -4,7 +4,7 @@ Name: %{pkg_name} Version: 2.4.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A dependently typed functional programming language and proof assistant License: MIT and BSD @@ -57,7 +57,9 @@ ExclusiveArch: %{ghc_arches_with_ghci} ExcludeArch: %{arm} Requires: ghc-%{name}-devel = %{version}-%{release} -Requires: emacs-agda = %{version}-%{release} +# introduced for F23 +Obsoletes: emacs-agda-el < 2.4.2.2-5 +Provides: emacs-agda = %{version}-%{release} %description Agda is a dependently typed functional programming language: it has @@ -93,39 +95,6 @@ Obsoletes: Agda < 2.3.1 This package provides the Haskell %{name} library development files. -%package -n emacs-agda -Summary: Emacs mode for the Agda language -Group: Applications/Editors -License: MIT -Requires: ghc-%{pkg_name}-devel = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} - -%description -n emacs-agda -Agda is a dependently typed functional programming language: it has -inductive families, which are similar to Haskell's GADTs, but they can -be indexed by values and not just types. It also has parameterized -modules, mixfix operators, Unicode characters, and an interactive -Emacs interface (the type checker can assist in the development of your code). - -This is the interactive Emacs mode for Agda. - - -%package -n emacs-agda-el -Summary: Elisp source files for Agda emacs mode -Group: Applications/Editors -License: MIT -Requires: emacs-agda = %{version}-%{release} - -%description -n emacs-agda-el -Agda is a dependently typed functional programming language: it has -inductive families, which are similar to Haskell's GADTs, but they can -be indexed by values and not just types. It also has parameterized -modules, mixfix operators, Unicode characters, and an interactive -Emacs interface (the type checker can assist in the development of your code). - -This package provides the elisp source files for the Emacs mode. - - %prep %setup -q @@ -199,6 +168,10 @@ rm %{buildroot}%{_docdir}/%{name}*/LICENSE %files %doc README.md +%dir %{_emacs_sitelispdir}/agda +%{_emacs_sitelispdir}/agda/*.el +%{_emacs_sitelispdir}/agda/*.elc +%{_emacs_sitestartdir}/*.el %files -n ghc-%{name} -f ghc-%{name}.files @@ -211,17 +184,11 @@ rm %{buildroot}%{_docdir}/%{name}*/LICENSE %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %doc CHANGELOG -%files -n emacs-agda -%dir %{_emacs_sitelispdir}/agda -%{_emacs_sitelispdir}/agda/*.elc -%{_emacs_sitestartdir}/*.el - - -%files -n emacs-agda-el -%{_emacs_sitelispdir}/agda/*.el - %changelog +* Wed Jul 22 2015 Jens Petersen - 2.4.2.2-5 +- drop emacs subpackages (#1234569) + * Tue Jun 16 2015 Fedora Release Engineering - 2.4.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild