diff --git a/atinject-target-1.5.patch b/atinject-target-1.5.patch deleted file mode 100644 index 69f07f0..0000000 --- a/atinject-target-1.5.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- atinject-1/build.sh~ 2009-10-14 01:36:31.000000000 +0200 -+++ atinject-1/build.sh 2014-06-09 08:21:06.686274678 +0200 -@@ -10,8 +10,8 @@ - mkdir -p build/tck/dist - - # Compile classes. --javac -g -d build/classes `find src -name *.java` --javac -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ -+javac -source 1.5 -target 1.5 -g -d build/classes `find src -name *.java` -+javac -source 1.5 -target 1.5 -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ - `find tck -name *.java` - - FOOTER="Copyright (C) 2009 \ diff --git a/atinject.spec b/atinject.spec index 601c399..7e765f2 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,6 +1,6 @@ Name: atinject Version: 1 -Release: 32.20100611svn86%{?dist} +Release: 33.20100611svn86%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 URL: http://code.google.com/p/atinject/ @@ -18,9 +18,6 @@ Source1: MANIFEST.MF Source2: MANIFEST-TCK.MF Source3: http://www.apache.org/licenses/LICENSE-2.0.txt -# Compile with source/target 1.5 -Patch0: %{name}-target-1.5.patch - BuildRequires: javapackages-local BuildRequires: java-devel BuildRequires: junit @@ -48,8 +45,6 @@ cp %{SOURCE3} LICENSE mkdir lib build-jar-repository -p lib junit -%patch0 -p1 - # Fix dep in TCK pom sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml @@ -64,7 +59,8 @@ sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml set -e alias rm=: alias xargs=: -alias javadoc='javadoc -Xdoclint:none' +alias javac="javac -source 1.8 -target 1.8" +alias javadoc="javadoc -source 1.8 -Xdoclint:none" . ./build.sh # Inject OSGi manifests required by Eclipse. @@ -85,6 +81,9 @@ mv build/tck/javadoc build/javadoc/tck %files tck -f .mfiles-tck %changelog +* Sat Jun 20 2020 Mat Booth - 1-33.20100611svn86 +- Allow building against Java 11 + * Tue Jan 28 2020 Fedora Release Engineering - 1-32.20100611svn86 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild