From 645e4246345386ec1c133e21a79cf23767dcf51a Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jul 2020 13:52:40 +0200
Subject: [PATCH] Update to upstream version 7.2.0~SNAPSHOT

---
 .gitignore                                    |  1 +
 ...Replace-bundled-jquery-with-CDN-link.patch | 14 ++++++-------
 generate-tarball-REMOVE.sh                    | 21 +++++++++++++++++++
 sources                                       |  2 +-
 testng.spec                                   | 14 +++++++++++--
 5 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100755 generate-tarball-REMOVE.sh

diff --git a/.gitignore b/.gitignore
index f9f6ea7..ba6bf31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /testng-7.0.0~beta7.tar.gz
 /testng-7.0.0.tar.gz
 /testng-7.1.1.tar.gz
+/testng-7.2.0~SNAPSHOT.tar.gz
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index 86835d6..060f29f 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Replace bundled jquery with CDN link
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java
-index 1d3e950..3b5bc0d 100644
+index f77bcaa..e5a8832 100644
 --- a/src/main/java/org/testng/reporters/jq/Main.java
 +++ b/src/main/java/org/testng/reporters/jq/Main.java
 @@ -21,7 +21,6 @@ public class Main implements IReporter {
@@ -19,20 +19,20 @@ index 1d3e950..3b5bc0d 100644
 -        "jquery-3.4.1.min.js",
          "testng-reports.css",
          "testng-reports.js",
-         "passed.png",
+         "testng-reports1.css",
 diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
-index 47f897b..a302d47 100644
+index e69a4be..1a1af79 100644
 --- a/src/main/resources/org/testng/header
 +++ b/src/main/resources/org/testng/header
-@@ -6,7 +6,7 @@
-   <title>TestNG reports</title>
+@@ -7,7 +7,7 @@
  
-     <link type="text/css" href="testng-reports.css" rel="stylesheet" />
+     <link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
+     <link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
 -    <script type="text/javascript" src="jquery-3.4.1.min.js"></script>
 +    <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
      <script type="text/javascript" src="testng-reports.js"></script>
      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
      <script type='text/javascript'>
 -- 
-2.20.1
+2.25.4
 
diff --git a/generate-tarball-REMOVE.sh b/generate-tarball-REMOVE.sh
new file mode 100755
index 0000000..be074b1
--- /dev/null
+++ b/generate-tarball-REMOVE.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+name=testng
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+upstream_version="$(echo ${version} | tr '~' '-')"
+
+# RETRIEVE
+rm -rf testng
+git clone https://github.com/cbeust/testng.git
+mv testng "${name}-${upstream_version}"
+
+# CLEAN TARBALL
+rm -rf "${name}-${upstream_version}"/.git
+rm -rf "${name}-${upstream_version}"/.github
+rm -r "${name}-${upstream_version}"/gradle*
+rm -r "${name}-${upstream_version}"/kobalt*
+rm "${name}-${upstream_version}"/src/main/resources/org/testng/jquery-*.js
+
+tar -czf "${name}-${version}.tar.gz" "${name}-${upstream_version}"
+rm -rf "${name}-${upstream_version}"
diff --git a/sources b/sources
index e151aee..4ec3361 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.1.1.tar.gz) = 7425db73db201297e09262eec83992cf7f649dd969da9a2c38646941f13a9f138caa89525afc5c39cc97f9edb9820f89e7456e7adc7fe036b668e502f7a5a9aa
+SHA512 (testng-7.2.0~SNAPSHOT.tar.gz) = 57f854b7828dd88e0c66714a8b385d9e18885d3677c36cc820f018b4da70765d0acd4b2de9d7f0f231131f002559c1a2e9ec830de18b9ec6b79c34791c97e244
diff --git a/testng.spec b/testng.spec
index d57e2cc..8a985c6 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,10 +1,15 @@
 Name:           testng
-Version:        7.1.1
+Version:        7.2.0~SNAPSHOT
 Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
-# ./generate-tarball.sh
+
+# TODO Remove after a proper release of version 7.2.0
+# This script downloads the current snapshot using git
+# ./generate-tarball-REMOVE.sh
+
+## ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
 # Allows building with maven instead of gradle
@@ -13,6 +18,8 @@ Source1:        pom.xml
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
 
+Source999:      generate-tarball-REMOVE.sh
+
 Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 
@@ -88,6 +95,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.2.0~SNAPSHOT-1
+- Update to upstream version 7.2.0~SNAPSHOT
+
 * Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.1.1-1
 - Update to upstream version 7.1.1