From 11396be06b823158af84d44c8ec517eb1bc2444a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 13 Aug 2020 14:46:13 -0600
Subject: [PATCH] Update to upstream version 4.13.

---
 create-tarball.sh |  2 +-
 junit.spec        | 21 +++++++++------------
 sources           |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/create-tarball.sh b/create-tarball.sh
index 1594760..0551a08 100755
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -6,7 +6,7 @@ if [ $# -ne 1 ]; then
 fi
 
 VERSION=${1}
-NAME="junit"
+NAME="junit4"
 
 wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz
 tar xvf r${VERSION}.tar.gz
diff --git a/junit.spec b/junit.spec
index 849c541..fb5178f 100644
--- a/junit.spec
+++ b/junit.spec
@@ -1,20 +1,21 @@
 Name:           junit
 Epoch:          1
-Version:        4.12
-Release:        18%{?dist}
+Version:        4.13
+Release:        1%{?dist}
 Summary:        Java regression test package
 License:        EPL-1.0
 URL:            http://www.junit.org/
 BuildArch:      noarch
 
 # ./clean-tarball.sh %%{version}
-Source0:        %{name}-%{version}-clean.tar.gz
+Source0:        %{name}4-%{version}-clean.tar.gz
 Source3:        create-tarball.sh
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 
 Obsoletes:      %{name}-demo < 4.12
 
@@ -37,10 +38,7 @@ Summary:        Javadoc for %{name}
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-r%{version}
-
-# InaccessibleBaseClassTest fails with Java 8
-sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
+%autosetup -n %{name}4-r%{version}
 
 %pom_remove_plugin :replacer
 sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
@@ -79,11 +77,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
       </properties>
     </profile>"
 
-# Ignore test that breaks on Java 11 due to unexpected extra annotations in the JDK standard library
-sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/junit/runners/model/TestClassTest.java
-
-# Set JPMS module name
-%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive" "<manifestEntries><Automatic-Module-Name>junit</Automatic-Module-Name></manifestEntries>"
+%pom_xpath_set //pom:compilerVersion 1.8
 
 %mvn_file : %{name}
 
@@ -105,6 +99,9 @@ sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/jun
 %doc doc/*
 
 %changelog
+* Thu Aug 13 2020 Jerry James <loganjerry@gmail.com> - 1:4.13-1
+- Update to upstream version 4.13
+
 * Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 1:4.12-18
 - Add automatic module name
 
diff --git a/sources b/sources
index d77668d..d5a7c9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0de14594aaba3379f6b19ba75a393232  junit-4.12-clean.tar.gz
+SHA512 (junit4-4.13-clean.tar.gz) = a5ca6378dd50d912ad77893c6435e9e6f9500e5bc0dda811a68741a7055bfbd990c4075f7e43e8027568fa5d2ffb4579a76fd11dda86e26f52032f91674af87e