From 09bdaaf3c7a8ca4d855971c0112a13b47067e8d2830bd24c90bd64e7117c7da2 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Mon, 23 Nov 2020 09:52:57 +0000 Subject: [PATCH 1/2] Accepting request 850142 from home:pmonrealgonzalez:branches:Java:packages - Fix RPM Lint complaint: summary-ended-with-dot OBS-URL: https://build.opensuse.org/request/show/850142 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=46 --- hamcrest.changes | 5 +++++ hamcrest.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hamcrest.changes b/hamcrest.changes index cded23f..2d877e4 100644 --- a/hamcrest.changes +++ b/hamcrest.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 19 12:48:02 UTC 2020 - Pedro Monreal + +- Fix RPM Lint complaint: summary-ended-with-dot + ------------------------------------------------------------------- Tue Nov 17 17:39:48 UTC 2020 - Pedro Monreal diff --git a/hamcrest.spec b/hamcrest.spec index e28ebc0..e995f12 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -61,7 +61,7 @@ used in other frameworks. Typical scenarios include testing frameworks, mocking libraries and UI validation rules. %package core -Summary: Core API of hamcrest matcher framework. +Summary: Core API of hamcrest matcher framework Group: Development/Libraries/Java Obsoletes: %{name} < %{version}-%{release} From b24b602c38f56d0b2116fc06d35a1fa55e295aa242cb86e9451adeae159d4bf1 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 5 Jan 2021 14:49:26 +0000 Subject: [PATCH 2/2] Accepting request 860470 from home:pmonrealgonzalez:branches:Java:packages - Make hamcrest build reproducibly [bsc#1120493] - Add hamcrest-reproducible-builds.patch - Fix typo in hamcrest-core description [bsc#1179994] OBS-URL: https://build.opensuse.org/request/show/860470 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=47 --- hamcrest-reproducible-builds.patch | 23 +++++++++++++++++++++++ hamcrest.changes | 11 +++++++++++ hamcrest.spec | 6 ++++-- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 hamcrest-reproducible-builds.patch diff --git a/hamcrest-reproducible-builds.patch b/hamcrest-reproducible-builds.patch new file mode 100644 index 0000000..ca611c6 --- /dev/null +++ b/hamcrest-reproducible-builds.patch @@ -0,0 +1,23 @@ +--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java ++++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java +@@ -43,6 +43,13 @@ + + private int currentMethod = -1; + private Method[] allMethods = cls.getMethods(); ++ { ++ java.util.Arrays.sort(allMethods, new java.util.Comparator() { ++ public int compare(Method m1, Method m2) { ++ return m1.toGenericString().compareTo(m2.toGenericString()); ++ } ++ }); ++ } + + @Override + public boolean hasNext() { +@@ -171,4 +178,4 @@ + return name.replace('$', '.'); + } + +-} +\ No newline at end of file ++} diff --git a/hamcrest.changes b/hamcrest.changes index 2d877e4..d9da33e 100644 --- a/hamcrest.changes +++ b/hamcrest.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 5 13:20:25 UTC 2021 - Pedro Monreal + +- Make hamcrest build reproducibly [bsc#1120493] +- Add hamcrest-reproducible-builds.patch + +------------------------------------------------------------------- +Tue Jan 5 13:01:10 UTC 2021 - Pedro Monreal + +- Fix typo in hamcrest-core description [bsc#1179994] + ------------------------------------------------------------------- Thu Nov 19 12:48:02 UTC 2020 - Pedro Monreal diff --git a/hamcrest.spec b/hamcrest.spec index e995f12..57388f2 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -1,7 +1,7 @@ # # spec file for package hamcrest # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,7 @@ Patch5: %{name}-%{version}-fork-javac.patch Patch6: %{name}-%{version}-javadoc9.patch Patch7: %{name}-%{version}-javadoc10.patch Patch8: %{name}-%{version}-random-build-crash.patch +Patch9: hamcrest-reproducible-builds.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -67,7 +68,7 @@ Obsoletes: %{name} < %{version}-%{release} %description core The core API of hamcrest matcher framework to be used by third-party framework providers. -This includes the a foundation set of matcher implementations for common operations. +This includes a foundation set of matcher implementations for common operations. %package javadoc Summary: Javadoc for %{name} @@ -112,6 +113,7 @@ rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 sed -i 's/\r//' LICENSE.txt