SPECS/glassfish-el.spec

@@ -3,7 +3,7 @@
 
 Name:          glassfish-el
 Version:       3.0.1
-Release:       0.14.b08%{?dist}
+Release:       0.7.b08%{?dist}
 Summary:       J2EE Expression Language Implementation
 License:       CDDL-1.1 or GPLv2 with exceptions
 URL:           http://uel.java.net
@@ -37,14 +37,13 @@ The main goals are:
 
 %package api
 Summary:       Expression Language 3.0 API
-License:       (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
+License:       (CDDL or GPLv2 with exceptions) and ASL 2.0
 
 %description api
 Expression Language 3.0 API.
 
 %package javadoc
 Summary:       Javadoc for %{name}
-License:       (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -146,7 +145,6 @@ cp -p api/target/classes/META-INF/LICENSE.txt .
 cp -p api/src/main/javadoc/doc-files/*-spec-license.html .
 
 %files -f .mfiles-javax.el
-
 %files api -f .mfiles-javax.el-api
 %license LICENSE.txt LICENSE-2.0.txt *-spec-license.html
 
@@ -154,27 +152,6 @@ cp -p api/src/main/javadoc/doc-files/*-spec-license.html .
 %license LICENSE.txt LICENSE-2.0.txt
 
 %changelog
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.0.1-0.14.b08
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-0.13.b08
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Sep 20 2019 Mat Booth <mat.booth@redhat.com> - 3.0.1-0.12.b08
-- Specify CDDL version on subpackages
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-0.11.b08
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-0.10.b08
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-0.9.b08
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-0.8.b08
-- Fix license tag of javadoc package
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-0.7.b08
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -229,4 +206,5 @@ cp -p api/src/main/javadoc/doc-files/*-spec-license.html .
 - Resolves: rhbz#918514
 
 * Fri Feb 1 2013 David Xie <david.scriptfan@gmail.com> - 2.2.5-1
-- Initial version of package
+- Initial version of package
+