From 934329f285efee569adc59c8fdc30da499c4760b Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 11 Sep 2020 14:01:42 +0200
Subject: [PATCH] Rebuild a properly versioned package

---
 .gitignore          |  1 +
 generate-tarball.sh | 18 ++++++++++++++++++
 jsr-305.spec        | 28 ++++++++++++++++++----------
 sources             |  2 +-
 4 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100755 generate-tarball.sh

diff --git a/.gitignore b/.gitignore
index b550f07..d005c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 jsr-305-0.4.20090319.tar.xz
 /jsr-305-20130910svn.tgz
+/jsr-305-3.0.2.tar.gz
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..740a55f
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+name=jsr-305
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+rm -rf "${name}-${version}"
+
+git clone 'https://github.com/amaembo/jsr-305'
+pushd 'jsr-305'
+git checkout 'd7734b13c61492982784560ed5b4f4bd6cf9bb2c'
+popd
+
+mv 'jsr-305' "${name}-${version}"
+
+rm -f "${name}-${version}.tar.gz"
+tar -czf "${name}-${version}.tar.gz" "${name}-${version}"
+rm -rf "${name}-${version}"
diff --git a/jsr-305.spec b/jsr-305.spec
index ce22011..df0dcc2 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -1,24 +1,21 @@
 Name:           jsr-305
-Version:        0
-Release:        0.25.20130910svn%{?dist}
+Version:        3.0.2
+Release:        1%{?dist}
 Summary:        Correctness annotations for Java code
 
 # The majority of code is BSD-licensed, but some Java sources
 # are licensed under CC-BY license, see: $ grep -r Creative .
 License:        BSD and CC-BY
-URL:            http://jsr-305.googlecode.com/
+URL:            https://code.google.com/p/jsr-305
 BuildArch:      noarch
 
-# There has been no official release yet.  This is a snapshot of the Subversion
-# repository as of 10 Sep 2013.  Use the following commands to generate the
-# tarball:
-#   svn export -r 51 http://jsr-305.googlecode.com/svn/trunk jsr-305
-#   tar -czvf jsr-305-20130910svn.tgz jsr-305
-Source0:        jsr-305-20130910svn.tgz
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
 # File containing URL to CC-BY license text
 Source1:        NOTICE-CC-BY.txt
 
 BuildRequires:  maven-local-openjdk8
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 
 %description
 This package contains reference implementations, test cases, and other
@@ -29,7 +26,7 @@ Detection.
 %{?javadoc_package}
 
 %prep
-%setup -q -n %{name}
+%setup -q
 cp %{SOURCE1} NOTICE-CC-BY
 
 %pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
@@ -41,6 +38,14 @@ cp %{SOURCE1} NOTICE-CC-BY
 # do not build sampleUses module - it causes Javadoc generation to fail
 %pom_disable_module sampleUses
 
+%pom_remove_parent ri
+%pom_add_parent org.jsr-305:jsr-305 ri
+
+%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin ri
+
 %build
 %mvn_build
 
@@ -52,6 +57,9 @@ cp %{SOURCE1} NOTICE-CC-BY
 %doc sampleUses
 
 %changelog
+* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 3.0.2-1
+- Rebuild a properly versioned package
+
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0-0.25.20130910svn
 - Build with OpenJDK 8
 
diff --git a/sources b/sources
index c033bb3..27a2250 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jsr-305-20130910svn.tgz) = 1e4406db39d1cd5bf6eccbcd711830d67b046e15eb9bb08f793cc03933bfb75b36b6ac6a32792a971356b68ccae1b62531102fcfa370a1d23f4afe6d3548a150
+SHA512 (jsr-305-3.0.2.tar.gz) = 378df0a3bb91d6ebf2e1673ff09e9c416734508a724c772834bed8d15d158d844c437ed126b2b8602997a3241cf2487b8bae9d00aa0cabe6464cebaf25bbcaeb