Rebase to upstream version v3.4.2

Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
Alexander Scheel 2020-05-12 15:21:11 -04:00
parent ec3b835d5d
commit b1e177b6ca
No known key found for this signature in database
GPG Key ID: C0D6C737D0003143
3 changed files with 13 additions and 12 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
/3.3.4.tar.gz
/disruptor-3.3.6.tar.gz
/disruptor-3.3.6.pom
/disruptor-3.4.2.pom
/disruptor-3.4.2.tar.gz

View File

@ -1,13 +1,11 @@
Name: disruptor
Version: 3.3.6
Release: 8%{?dist}
Version: 3.4.2
Release: 1%{?dist}
Summary: Concurrent Programming Framework
License: ASL 2.0
URL: http://lmax-exchange.github.io/disruptor/
URL: https://lmax-exchange.github.io/disruptor/
Source0: https://github.com/LMAX-Exchange/disruptor/archive/%{version}/%{name}-%{version}.tar.gz
Source1: http://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom
# see http://www.jmock.org/threading-synchroniser.html
Patch0: disruptor-3.3.2-jmock.patch
Source1: https://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
@ -33,13 +31,11 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
%setup -q
%autosetup
# Cleanup
find . -name "*.class" -print -delete
find . -name "*.jar" -type f -print -delete
%patch0 -p1
cp -p %{SOURCE1} pom.xml
# Add OSGi support
@ -75,7 +71,7 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
%build
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%install
%mvn_install
@ -88,6 +84,9 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
%license LICENCE.txt
%changelog
* Tue May 12 2020 Alexander Scheel <ascheel@redhat.com> - 3.4.2-1
- Rebase to disruptor upstream release v3.4.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1,2 +1,2 @@
765fc09cc8595194defd8575cfb80122 disruptor-3.3.6.tar.gz
cd7fb9a74e788ee9624ad6218ec353ed disruptor-3.3.6.pom
SHA512 (disruptor-3.4.2.pom) = 24ff7625e14bc14967f838237097b3042edcb0e7f34bef1423b45761b6cef72c360d6f24ec4375330aec7bf6b9904eaa33f1cca373ac69304d1120f7a46ebde7
SHA512 (disruptor-3.4.2.tar.gz) = 17187664d8e8a87566fbc08900dc80110ccdc53be4b78e486a4a7510e9a6bed08854a288bc9a95907a5fd8d1c5fb9d119838264c279ba257281f9bcb62bd9141