Compare commits

2 Commits

Author SHA256 Message Date
f3de603594 re-add accidentally removed file 2025-08-21 06:19:26 +02:00
f3a4bcade6 Import missing r16 2025-08-21 06:19:26 +02:00
5 changed files with 103 additions and 18 deletions

20
concurrent-1.3.4.pom Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
<name>Dough Lea's util.concurrent package</name>
<licenses>
<license>
<name>Public domain, Sun Microsoystems</name>
<url>>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
<comments>All classes are released to the public domain and may be used for any purpose whatsoever without permission or acknowledgment. Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are adapted from Sun JDK source code. These are copyright of Sun Microsystems, Inc, and are used with their kind permission, &lt;a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf">as described in this license&lt;/a>.</comments>
</license>
</licenses>
<organization>
<name>Dough Lea</name>
<url>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
</organization>
</project>

21
concurrent-jdk17.patch Normal file
View File

@@ -0,0 +1,21 @@
diff -up concurrent/FJTaskRunner.java.p01 concurrent/FJTaskRunner.java
--- concurrent/FJTaskRunner.java.p01 2023-03-07 17:29:39.264250118 +0300
+++ concurrent/FJTaskRunner.java 2023-03-07 17:35:50.780522214 +0300
@@ -681,7 +681,7 @@ public class FJTaskRunner extends Thread
setPriority(scanPriority);
}
else { // otherwise we are at low priority; just yield
- yield();
+ this.yield();
}
}
}
@@ -768,7 +768,7 @@ public class FJTaskRunner extends Thread
setPriority(scanPriority);
}
else {
- yield();
+ this.yield();
}
}
}

View File

@@ -1,3 +1,29 @@
-------------------------------------------------------------------
Wed Feb 21 10:40:19 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Wed Feb 21 08:39:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Sun Mar 12 03:12:26 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
- Add build dependency on java-javadoc
- Update upstream source tarball
-------------------------------------------------------------------
Tue Mar 7 14:17:18 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
- Package maven metadata
- Package javadocs
- Add patch:
* concurrent-jdk17.patch
+ Avoid “invalid use of a restricted identifier 'yield'” error
during javadocs generation
-------------------------------------------------------------------
Wed May 16 10:41:19 UTC 2018 - fstrba@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package concurrent
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,14 +22,16 @@ Release: 0
Summary: Utility Classes for Concurrent Java Programming
License: SUSE-Public-Domain
Group: Development/Libraries/Java
Url: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/
Source0: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
Source1: %{name}-%{version}.build.xml
URL: https://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
Source0: https://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/%{name}.tar.gz
Source1: https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Source2: %{name}-%{version}.build.xml
Patch0: concurrent-jdk8.patch
Patch1: concurrent-jdk17.patch
BuildRequires: ant
BuildRequires: java-devel >= 1.8
Obsoletes: %{name}-javadoc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: java-javadoc >= 1.8
BuildRequires: javapackages-local >= 6
BuildArch: noarch
%description
@@ -40,26 +42,42 @@ is merely intended to save you the trouble of coding them. Discussions
of the rationale and application of several of these classes can be
found in the second edition of Concurrent Programming in Java.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
API documentation for %{name}.
%prep
%setup -q -c
%patch0 -p0
%patch -P 0
%patch -P 1
mkdir -p src/EDU/oswego/cs/dl/util
mv concurrent src/EDU/oswego/cs/dl/util
cp %{SOURCE1} build.xml
cp %{SOURCE2} build.xml
%build
ant \
-Dversion=%{version} \
-Dj2se.apiurl=%{_javadocdir}/java \
jar
jar javadoc
%install
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 %{name}-%{version}.jar %{buildroot}%{_javadir}/
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
install -dm0755 %{buildroot}%{_javadir}
install -m0644 %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%files
%defattr(0644,root,root,0755)
%{_javadir}/*.jar
install -dm0755 %{buildroot}%{_mavenpomdir}
%{mvn_install_pom} %{SOURCE1} %{buildroot}/%{_mavenpomdir}/%{name}.pom
install -dm0755 %{buildroot}%{_javadocdir}/%{name}
cp -rf docs/* %{buildroot}%{_javadocdir}/%{name}/
%add_maven_depmap %{name}.pom %{name}.jar
%files -f .mfiles
%files javadoc
%{_javadocdir}/%{name}
%changelog

BIN
concurrent.tar.gz (Stored with Git LFS)

Binary file not shown.