[ghc-Agda] adjust library license tag to include BSD also

[Jens Petersen]

commit f94707007340cb9876f55fcabb54f9fb951e2ff1
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu May 31 10:21:30 2012 +0900

    adjust library license tag to include BSD also
    
    other minor cleanup:
    - remove trailing vertical space from common_description
    - emacs subpackages are just MIT
    - emacs subpackage requires same ver-rel of library
    - append emacs descriptions
    - make sure we install all elisp even if we forget to update elisp_files in future
    - move relnotes to devel

 ghc-Agda.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/ghc-Agda.spec b/ghc-Agda.spec
index 47842d8..4052fbe 100644
--- a/ghc-Agda.spec
+++ b/ghc-Agda.spec
@@ -1,4 +1,4 @@
-# cabal2spec-0.25.4
+# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -18,17 +18,15 @@ Agda is also a proof assistant: It is an interactive system for writing and\
 checking proofs. Agda is based on intuitionistic type theory,\
 a foundational system for constructive mathematics developed by\
 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.\
-\
-\
+proof assistants based on dependent types, such as Coq, Epigram and NuPRL.
 
 Name:           ghc-%{pkg_name}
 Version:        2.3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependently typed functional programming language
 
 Group:          Development/Languages
-License:        MIT
+License:        MIT and BSD
 # BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
@@ -64,22 +62,27 @@ then you should also install Agda-executable.
 %package -n emacs-agda
 Summary:        Emacs mode for the Agda language
 Group:          Applications/Editors
-Requires:       ghc-%{pkg_name}-devel
+License:        MIT
+Requires:       ghc-%{pkg_name}-devel = %{version}-%{release}
 Requires:       emacs-haskell-mode
 Requires:       emacs(bin) >= %{_emacs_version}
 
 %description -n emacs-agda
 %{common_description}
 
+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
 %{common_description}
 
+This provides the Emacs Lisp source files for the Agda interactive mode.
+
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
@@ -101,8 +104,8 @@ cd -
 %ghc_lib_install
 
 mkdir -p %{buildroot}%{_emacs_sitelispdir}/agda
-for i in %elisp_files; do
-  install -p -m 0644 src/data/emacs-mode/$i* %{buildroot}%{_emacs_sitelispdir}/agda
+for i in src/data/emacs-mode/*; do
+  install -p -m 0644 $i %{buildroot}%{_emacs_sitelispdir}/agda
 done
 
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
@@ -124,7 +127,8 @@ echo %{_datadir}/%{pkg_name}-%{version}/Agda.css >> ghc-%{pkg_name}.files
 %ghc_devel_post_postun
 
 
-%ghc_files LICENSE doc/release-notes
+%ghc_files LICENSE
+%doc doc/release-notes
 
 
 %files -n emacs-agda
@@ -141,6 +145,10 @@ echo %{_datadir}/%{pkg_name}-%{version}/Agda.css >> ghc-%{pkg_name}.files
 
 
 %changelog
+* Thu May 31 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-2
+- library license is also BSD (#710031)
+- move release notes to devel subpackage
+
 * Tue Apr 10 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-1
 - update to 2.3.0.1 for ghc-7.4.1