.gitignore

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

.glassfish-servlet-api.metadata

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

SPECS/glassfish-servlet-api.spec

@@ -1,11 +1,14 @@
-Name:           glassfish-servlet-api
-Version:        4.0.1
-Release:        2%{?dist}
-Summary:        Java Servlet API
-License:        (CDDL-1.0 or GPLv2 with exceptions) and ASL 2.0
-URL:            https://javaee.github.io/servlet-spec/
+%global artifactId javax.servlet-api
 
-Source0:        https://github.com/javaee/servlet-spec/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Name:           glassfish-servlet-api
+Version:        3.1.0
+Release:        14%{?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
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:      noarch
@@ -30,16 +33,13 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n servlet-spec-%{version}
-
+%setup -q -n %{artifactId}-%{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 :javax.servlet-api glassfish-servlet-api
+%mvn_file :%{artifactId} %{name}
 
 %build
 %mvn_alias : javax.servlet:servlet-api
@@ -52,22 +52,13 @@ cp -p src/main/resources/META-INF/README .
 
 %files -f .mfiles
 %doc README
-%license LICENSE-2.0.txt LICENSE
+%license LICENSE-2.0.txt
 
 %files javadoc -f .mfiles-javadoc
 %doc README
-%license LICENSE-2.0.txt LICENSE
+%license LICENSE-2.0.txt
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.1-2
-- Mass rebuild for javapackages-tools 201902
-
-* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.1-1
-- Update to upstream version 4.0.1
-
-* 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