Compare commits

...

No commits in common. "c8-stream-rhel8" and "c8-stream-201902" have entirely different histories.

3 changed files with 23 additions and 28 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/javax.servlet-api-3.1.0.tar.xz
SOURCES/glassfish-servlet-api-4.0.1.tar.gz

View File

@ -1 +1 @@
30227f6152fe7febbe70330e1f47ac57094e999d SOURCES/javax.servlet-api-3.1.0.tar.xz
50f70c543342255050ccb8ca227de45f0fbafb90 SOURCES/glassfish-servlet-api-4.0.1.tar.gz

View File

@ -1,14 +1,11 @@
%global artifactId javax.servlet-api
Name: glassfish-servlet-api
Version: 3.1.0
Release: 19%{?dist}
Version: 4.0.1
Release: 2%{?dist}
Summary: Java Servlet API
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://servlet-spec.java.net
# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1.0 javax.servlet-api-3.1.0
# tar cvJf javax.servlet-api-3.1.0.tar.xz javax.servlet-api-3.1.0/
Source0: %{artifactId}-%{version}.tar.xz
License: (CDDL-1.0 or GPLv2 with exceptions) and ASL 2.0
URL: https://javaee.github.io/servlet-spec/
Source0: https://github.com/javaee/servlet-spec/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@ -19,6 +16,7 @@ BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
BuildRequires: maven-source-plugin
%description
The javax.servlet package contains a number of classes
and interfaces that describe and define the contracts between
@ -32,13 +30,16 @@ Summary: Javadoc for %{name}
API documentation for %{name}.
%prep
%setup -q -n %{artifactId}-%{version}
%setup -q -n servlet-spec-%{version}
%pom_remove_plugin :maven-remote-resources-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :glassfish-copyright-maven-plugin
cp -p %{SOURCE1} .
# README contains also part of javax.servlet-api license
cp -p src/main/resources/META-INF/README .
%mvn_file :%{artifactId} %{name}
%mvn_file :javax.servlet-api glassfish-servlet-api
%build
%mvn_alias : javax.servlet:servlet-api
@ -51,27 +52,21 @@ cp -p src/main/resources/META-INF/README .
%files -f .mfiles
%doc README
%license LICENSE-2.0.txt
%license LICENSE-2.0.txt LICENSE
%files javadoc -f .mfiles-javadoc
%doc README
%license LICENSE-2.0.txt
%license LICENSE-2.0.txt LICENSE
%changelog
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.0-19
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.1-2
- Mass rebuild for javapackages-tools 201902
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.1-1
- Update to upstream version 4.0.1
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-15
- Mass rebuild for javapackages-tools 201901
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -117,4 +112,4 @@ cp -p src/main/resources/META-INF/README .
- Update to 3.1.0
* Sat Mar 09 2013 David Xie <david.scriptfan@gmail.com> - 3.1-0.1.b07
- Initial version of package
- Initial version of package