From cedadb3e456437fb4d4c36b4562a1b9cfd8d3197 Mon Sep 17 00:00:00 2001 From: lxpzero Date: Tue, 15 Apr 2025 17:58:28 +0800 Subject: [PATCH] remove BuildRequires openjdk8 --- NOTICE-CC-BY.txt | 4 ---- jcip-annotations-1.0-1.tar.gz | Bin 0 -> 7524 bytes jsr-305.spec | 33 ++++++++++++++++++++++----------- 3 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 NOTICE-CC-BY.txt create mode 100644 jcip-annotations-1.0-1.tar.gz diff --git a/NOTICE-CC-BY.txt b/NOTICE-CC-BY.txt deleted file mode 100644 index ab3e0dd..0000000 --- a/NOTICE-CC-BY.txt +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2005 Brian Goetz -Released under the Creative Commons Attribution License - (http://creativecommons.org/licenses/by/2.5) -Official home: http://www.jcip.net diff --git a/jcip-annotations-1.0-1.tar.gz b/jcip-annotations-1.0-1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fc8e1a3e217a610deee92ddc1c9cde4b4b5ac148 GIT binary patch literal 7524 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 literal 0 HcmV?d00001 diff --git a/jsr-305.spec b/jsr-305.spec index 0bdac95..b21356f 100644 --- a/jsr-305.spec +++ b/jsr-305.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without bootstrap Name: jsr-305 @@ -6,22 +6,20 @@ Version: 3.0.2 Release: %{anolis_release}%{?dist} Summary: Correctness annotations for Java code -# The majority of code is BSD-licensed, but some Java sources -# are licensed under CC-BY license, see: $ grep -r Creative . -License: BSD and CC-BY +# The majority of code is BSD-licensed. +# JCIP annotations are Apache-licensed. +License: BSD-3-Clause AND Apache-2.0 URL: https://code.google.com/p/jsr-305 BuildArch: noarch ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -# File containing URL to CC-BY license text -Source1: NOTICE-CC-BY.txt +Source1: https://github.com/stephenc/jcip-annotations/archive/refs/tags/jcip-annotations-1.0-1.tar.gz %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif @@ -34,9 +32,18 @@ Detection. %prep %setup -q -cp %{SOURCE1} NOTICE-CC-BY -%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6 +# Replace javax.annotation.concurrent annotations (that are based on +# code from https://jcip.net/ and are licensed under CC-BY-2.5, which +# is not Fedora-approved for code) with a clean-room implementation +# under Apache-2.0 from https://github.com/stephenc/jcip-annotations +tar xf %{SOURCE1} +rm -rf ri/src/main/java/javax/annotation/concurrent +mv jcip-annotations-jcip-annotations-1.0-1/src/main/java/net/jcip/annotations ri/src/main/java/javax/annotation/concurrent +sed -i /^package/s/net.jcip.annotations/javax.annotation.concurrent/ ri/src/main/java/javax/annotation/concurrent/* + +%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.8 +%pom_remove_plugin :maven-compiler-plugin ri sed -i 's|com\.google\.code\.findbugs|org.jsr-305|' ri/pom.xml sed -i 's|jsr305|ri|' ri/pom.xml @@ -63,9 +70,13 @@ sed -i 's|jsr305|ri|' ri/pom.x %mvn_install %files -f .mfiles -%license ri/LICENSE NOTICE-CC-BY +%license ri/LICENSE jcip-annotations-jcip-annotations-1.0-1/LICENSE.txt %doc sampleUses %changelog +* Tue Apr 15 2025 Xiaoping Liu - 3.0.2-2 +- remove BuildRequires openjdk8 +- Replace CC-BY-2.5 annotations with Apache-2.0 ones + * Sun Apr 16 2023 Funda Wang - 3.0.2-1 - Import package for anolis 23 -- Gitee