From 4d67f718c294e1256037d8ec80d1669d4bee5f64 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Oct 16 2019 09:36:31 +0000
Subject: update to version 1.3.2


---

diff --git a/.gitignore b/.gitignore
index 1ff2e82..a1f2708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+/results_*
+/*.src.rpm
+
 /glassfish-annotation-api-1.2-src-svn.tar.gz
+/javax.annotation-1.3.2.tar.gz
diff --git a/glassfish-annotation-api.spec b/glassfish-annotation-api.spec
index 12cfc5f..e7340e7 100644
--- a/glassfish-annotation-api.spec
+++ b/glassfish-annotation-api.spec
@@ -1,25 +1,28 @@
 %global namedreltag %{nil}
 %global namedversion %{version}%{?namedreltag}
 %global oname javax.annotation-api
+%global sname javax.annotation
+
 Name:          glassfish-annotation-api
-Version:       1.2
-Release:       16%{?dist}
+Version:       1.3.2
+Release:       1%{?dist}
 Summary:       Common Annotations API Specification (JSR 250)
-License:       CDDL or GPLv2 with exceptions
-# http://jcp.org/en/jsr/detail?id=250
-URL:           http://glassfish.java.net/
-# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.annotation-api-1.2/ glassfish-annotation-api-1.2
-# tar czf glassfish-annotation-api-1.2-src-svn.tar.gz glassfish-annotation-api-1.2
-Source0:       %{name}-%{namedversion}-src-svn.tar.gz
+License:       CDDL-1.1 or GPLv2 with exceptions
 
-BuildRequires: jvnet-parent
-BuildRequires: glassfish-legal
+# NOTE: The new upstream repository under the Eclipse EE4J umbrella is here:
+# https://github.com/eclipse-ee4j/common-annotations-api
+# However, the new package provides a different groupId:artifactId.
+URL:           https://github.com/javaee/%{sname}
+Source0:       %{url}/archive/%{version}/%{sname}-%{version}.tar.gz
 
 BuildRequires: maven-local
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-remote-resources-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: spec-version-maven-plugin
+BuildRequires: mvn(net.java:jvnet-parent:pom:)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.glassfish.build:spec-version-maven-plugin)
+# xmvn-builddep misses this one
+BuildRequires: mvn(org.glassfish:legal)
 
 BuildArch:     noarch
 
@@ -33,28 +36,29 @@ Summary:       Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n %{sname}-%{namedversion}
+
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :maven-gpg-plugin
 
-%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 %mvn_file :%{oname} %{name}
 
 %build
-
 %mvn_build
 
-sed -i 's/\r//' target/classes/META-INF/LICENSE.txt
-cp -p target/classes/META-INF/LICENSE.txt .
-
 %install
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE.txt
+%license LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE.txt
+%license LICENSE
 
 %changelog
+* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-1
+- Update to version 1.3.2.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
@@ -105,4 +109,4 @@ cp -p target/classes/META-INF/LICENSE.txt .
 - update to 1.2
 
 * Tue Apr 02 2013 gil cattaneo <puntogil@libero.it> 1.2-0.1.b04
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index 62ea9d4..0f48917 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c0dcd1deb608629f780b83598053bb3  glassfish-annotation-api-1.2-src-svn.tar.gz
+SHA512 (javax.annotation-1.3.2.tar.gz) = 222586a35b588065f8f510ce7cf450da1235606291d6ce2cb9ef88813d605423afbff315f90efe35be35687c6d0391e65fdaabe1c3f7cb3fd6fa54fc6a82529a