pool/hamcrest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 860470 from home:pmonrealgonzalez:branches:Java:packages

Browse Source 
- 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
This commit is contained in:
Pedro Monreal Gonzalez 2021-01-05 14:49:26 +00:00 committed by Git OBS Bridge
parent 09bdaaf3c7
commit b24b602c38
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hamcrest-reproducible-builds.patch Normal file
View File

@ -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<Method>() {
+ 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
+}

11
hamcrest.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jan 5 13:20:25 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
- Make hamcrest build reproducibly [bsc#1120493]
- Add hamcrest-reproducible-builds.patch
-------------------------------------------------------------------
Tue Jan 5 13:01:10 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
- Fix typo in hamcrest-core description [bsc#1179994]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 19 12:48:02 UTC 2020 - Pedro Monreal <pmonreal@suse.com> Thu Nov 19 12:48:02 UTC 2020 - Pedro Monreal <pmonreal@suse.com>

6
hamcrest.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hamcrest # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Patch6: %{name}-%{version}-javadoc9.patch
Patch7: %{name}-%{version}-javadoc10.patch Patch7: %{name}-%{version}-javadoc10.patch
Patch8: %{name}-%{version}-random-build-crash.patch Patch8: %{name}-%{version}-random-build-crash.patch
Patch9: hamcrest-reproducible-builds.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -67,7 +68,7 @@ Obsoletes: %{name} < %{version}-%{release}
%description core %description core
The core API of hamcrest matcher framework to be used by third-party framework providers. 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 %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
@ -112,6 +113,7 @@ rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
sed -i 's/\r//' LICENSE.txt sed -i 's/\r//' LICENSE.txt