From 98a562f8b50adf37382b7b00bc89a575bfa6bf13 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 18 Sep 2019 15:32:27 +0200
Subject: [PATCH] Update to upstream version 2.2~rc1

---
 .gitignore    |  2 ++
 hamcrest.spec | 13 +++++++++----
 sources       |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf81d22..c6dd817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /hamcrest-java-1.3.tar.gz
 /hamcrest-2.1.tar.gz
 /hamcrest-2.1.pom
+/hamcrest-2.2~rc1.tar.gz
+/hamcrest-2.2-rc1.pom
diff --git a/hamcrest.spec b/hamcrest.spec
index 80ddfdd..7303bae 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -28,14 +28,16 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%global upstream_version %(echo %{version} | tr '~' '-')
+
 Name:           hamcrest
-Version:        2.1
+Version:        2.2~rc1
 Release:        1%{?dist}
 Summary:        Library of matchers for building test expressions
 License:        BSD
 URL:            https://github.com/hamcrest/JavaHamcrest
-Source0:        https://github.com/hamcrest/JavaHamcrest/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{version}/hamcrest-%{version}.pom
+Source0:        https://github.com/hamcrest/JavaHamcrest/archive/v%{upstream_version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{upstream_version}/hamcrest-%{upstream_version}.pom
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
@@ -55,7 +57,7 @@ Summary:        Javadoc for %{name}
 Javadoc for %{name}.
 
 %prep
-%setup -q -n JavaHamcrest-%{version}
+%setup -q -n JavaHamcrest-%{upstream_version}
 
 rm -rf docs
 rm -rf *gradle*
@@ -104,6 +106,9 @@ sed -i 's/\r//' LICENSE.txt
 %license LICENSE.txt
 
 %changelog
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.2~rc1-1
+- Update to upstream version 2.2~rc1
+
 * Mon Aug 19 2019 Marian Koncek <mkoncek@redhat.com> - 2.1-1
 - Update to upstream version 2.1
 
diff --git a/sources b/sources
index da013fa..21f2f3f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (hamcrest-2.1.tar.gz) = 15a67b040cf95141b241e201bd5ff14b913dea53fd2dc8305e8d2768e5e214457efa1eed75e66d95a0be575b6c5b611e281886c7661d75e186165c3861698abc
-SHA512 (hamcrest-2.1.pom) = b5b82c4333bf8b882286a6f8470f6a8c9eabe1a3e89353e9b744010ea2f64345815b6999d3c6eaeb44f3308280a9062ab2a770985ba45b445506659d331bc145
+SHA512 (hamcrest-2.2~rc1.tar.gz) = 62d9f311b979363359c0ba4edc43611378f8d47f1f385c2af92bb9b33cc1df19f1de665e67c5bc2690dff23a834dd09de683b9571b4078b4b7e4db12a73af731
+SHA512 (hamcrest-2.2-rc1.pom) = 3c609d989613e58d452387e82ce6c0172326895af5f58c390ab814e269877d1a7e7078af5a5325e7dbe60d0543adb36ad2a700d3b33bf2b8f164577efa7c912d