From 7699a83485d603e76b04870eae6b730d083d9480 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/11] Switch to SHA512 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a62285a..ce6dbae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5ed77767af2fa4ba8ef66c3e966bd2b2 atinject-1.tar.xz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (atinject-1.tar.xz) = 45cef31ebfe7b3b7b327aa8aa5c06c86701071e14694f60df0a581c5d25e9691a92a27c31aee03c6226035b9d96b5a40cc8e4a490eea4ef23e289b8c36c60d49 +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 003f5e186333302aec29c3ce3d31b09f8986ea37 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:24 +0200 Subject: [PATCH 02/11] Mass rebuild for javapackages-tools 201901 --- atinject.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atinject.spec b/atinject.spec index f9d44fb..abbb626 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,6 +1,6 @@ Name: atinject Version: 1 -Release: 28.20100611svn86%{?dist} +Release: 29.20100611svn86%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 URL: http://code.google.com/p/atinject/ @@ -85,6 +85,9 @@ mv build/tck/javadoc build/javadoc/tck %files tck -f .mfiles-tck %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1-29.20100611svn86 +- Mass rebuild for javapackages-tools 201901 + * Wed Apr 18 2018 Mikolaj Izdebski - 1-28.20100611svn86 - Remove javax.inject Provides From aeb9378b65202cf4eb73ea96355bde310677ad71 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Jun 2019 14:59:09 +0200 Subject: [PATCH 03/11] Drop custom %mvn_file --- atinject.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/atinject.spec b/atinject.spec index abbb626..ee6ee9d 100644 --- a/atinject.spec +++ b/atinject.spec @@ -53,11 +53,7 @@ build-jar-repository -p lib junit # Fix dep in TCK pom sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml -# J2EE API symlinks -%mvn_file :javax.inject atinject javax.inject/atinject - # TCK sub-package -%mvn_file :javax.inject-tck atinject-tck %mvn_package :javax.inject-tck tck %build From 3dacf6084ab9ff42280eb15ba2a3f7a5847a5437 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 Jun 2019 15:13:27 +0200 Subject: [PATCH 04/11] Declare module package --- atinject.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atinject.spec b/atinject.spec index ee6ee9d..1d61e02 100644 --- a/atinject.spec +++ b/atinject.spec @@ -40,6 +40,7 @@ Requires: junit %description tck %{summary}. +%{?module_package} %{?javadoc_package} %prep @@ -75,7 +76,7 @@ mv build/tck/javadoc build/javadoc/tck %install %mvn_install -J build/javadoc -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE %files tck -f .mfiles-tck From 3d33801027dcb88ffd561c66c6844c0c50ac77b8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:37:49 +0200 Subject: [PATCH 05/11] Revert "Drop custom %mvn_file" This reverts commit aeb9378b65202cf4eb73ea96355bde310677ad71. --- atinject.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/atinject.spec b/atinject.spec index 1d61e02..8f3734a 100644 --- a/atinject.spec +++ b/atinject.spec @@ -54,7 +54,11 @@ build-jar-repository -p lib junit # Fix dep in TCK pom sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml +# J2EE API symlinks +%mvn_file :javax.inject atinject javax.inject/atinject + # TCK sub-package +%mvn_file :javax.inject-tck atinject-tck %mvn_package :javax.inject-tck tck %build From 3f3ad6192c772619bcec8773699cfe2797cf1948 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 13:34:05 +0100 Subject: [PATCH 06/11] Switch compiler sourte/target to 1.6 --- atinject-target-1.5.patch => atinject-target-1.6.patch | 4 ++-- atinject.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename atinject-target-1.5.patch => atinject-target-1.6.patch (78%) diff --git a/atinject-target-1.5.patch b/atinject-target-1.6.patch similarity index 78% rename from atinject-target-1.5.patch rename to atinject-target-1.6.patch index 69f07f0..097412a 100644 --- a/atinject-target-1.5.patch +++ b/atinject-target-1.6.patch @@ -6,8 +6,8 @@ # 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 \ ++javac -source 1.6 -target 1.6 -g -d build/classes `find src -name *.java` ++javac -source 1.6 -target 1.6 -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 8f3734a..b61316b 100644 --- a/atinject.spec +++ b/atinject.spec @@ -18,8 +18,8 @@ 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 +# Compile with source/target 1.6 +Patch0: %{name}-target-1.6.patch BuildRequires: javapackages-local BuildRequires: java-devel From 7f42990c76b15395cc098a0e27c8810078f5bf37 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 07/11] Mass rebuild for javapackages-tools 201902 --- atinject.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atinject.spec b/atinject.spec index b61316b..d112e7d 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,6 +1,6 @@ Name: atinject Version: 1 -Release: 29.20100611svn86%{?dist} +Release: 30.20100611svn86%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 URL: http://code.google.com/p/atinject/ @@ -86,6 +86,9 @@ mv build/tck/javadoc build/javadoc/tck %files tck -f .mfiles-tck %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1-30.20100611svn86 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1-29.20100611svn86 - Mass rebuild for javapackages-tools 201901 From 24d4d35226d048c880c6c9e53b0888c177dad8f4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 08/11] Build with OpenJDK 8 --- atinject.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/atinject.spec b/atinject.spec index d112e7d..0d66060 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,6 +1,6 @@ Name: atinject Version: 1 -Release: 30.20100611svn86%{?dist} +Release: 31.20100611svn86%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 URL: http://code.google.com/p/atinject/ @@ -22,7 +22,7 @@ Source3: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: %{name}-target-1.6.patch BuildRequires: javapackages-local -BuildRequires: java-devel +BuildRequires: java-1.8.0-openjdk-devel BuildRequires: junit %description @@ -66,6 +66,7 @@ set -e alias rm=: alias xargs=: alias javadoc='javadoc -Xdoclint:none' +export PATH="%{_jvmlibdir}/java-1.8.0-openjdk/bin:${PATH}" . ./build.sh # Inject OSGi manifests required by Eclipse. @@ -86,6 +87,9 @@ mv build/tck/javadoc build/javadoc/tck %files tck -f .mfiles-tck %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1-31.20100611svn86 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1-30.20100611svn86 - Mass rebuild for javapackages-tools 201902 From 023f778c5b2f738dcc07047f569d9edce7efcd04 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 15:53:32 +0200 Subject: [PATCH 09/11] Update to upstream version 2.0.2 --- .gitignore | 1 + atinject.spec | 77 +++++++++++---------------------------------------- sources | 3 +- 3 files changed, 18 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 70b56d8..8a0bae0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /LICENSE-2.0.txt /noarch /*.src.rpm +/1.0.1.tar.gz diff --git a/atinject.spec b/atinject.spec index 0d66060..3dc68cd 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,29 +1,14 @@ Name: atinject -Version: 1 -Release: 31.20100611svn86%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 -URL: http://code.google.com/p/atinject/ +URL: https://github.com/eclipse-ee4j/injection-api BuildArch: noarch -# latest release doesn't generate javadocs and there is no source -# tarball with pom.xml or ant build file -# -# svn export -r86 http://atinject.googlecode.com/svn/trunk atinject-1 -# rm -rf atinject-1/{lib,javadoc}/ -# tar caf atinject-1.tar.xz atinject-1 -Source0: %{name}-%{version}.tar.xz -# These manifests based on the ones shipped by eclipse.org -Source1: MANIFEST.MF -Source2: MANIFEST-TCK.MF -Source3: http://www.apache.org/licenses/LICENSE-2.0.txt +Source0: https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz -# Compile with source/target 1.6 -Patch0: %{name}-target-1.6.patch - -BuildRequires: javapackages-local -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: junit +BuildRequires: maven-local %description This package specifies a means for obtaining objects in such a way as @@ -32,61 +17,31 @@ traditional approaches such as constructors, factories, and service locators (e.g., JNDI). This process, known as dependency injection, is beneficial to most nontrivial applications. -%package tck -Summary: TCK for testing %{name} compatibility with JSR-330 -Requires: %{name} = %{version}-%{release} -Requires: junit - -%description tck -%{summary}. - %{?module_package} %{?javadoc_package} %prep -%setup -q -cp %{SOURCE3} LICENSE -mkdir lib -build-jar-repository -p lib junit +%setup -q -n injection-api-%{version} -%patch0 -p1 +%pom_remove_parent +%pom_remove_plugin -r :maven-javadoc-plugin -# Fix dep in TCK pom -sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml - -# J2EE API symlinks -%mvn_file :javax.inject atinject javax.inject/atinject - -# TCK sub-package -%mvn_file :javax.inject-tck atinject-tck -%mvn_package :javax.inject-tck tck +%mvn_alias : javax.inject:javax.inject +%mvn_file : atinject %build -set -e -alias rm=: -alias xargs=: -alias javadoc='javadoc -Xdoclint:none' -export PATH="%{_jvmlibdir}/java-1.8.0-openjdk/bin:${PATH}" -. ./build.sh - -# Inject OSGi manifests required by Eclipse. -jar umf %{SOURCE1} build/dist/javax.inject.jar -jar umf %{SOURCE2} build/tck/dist/javax.inject-tck.jar - -%mvn_artifact pom.xml build/dist/javax.inject.jar -%mvn_artifact tck-pom.xml build/tck/dist/javax.inject-tck.jar - -mv build/tck/javadoc build/javadoc/tck +%mvn_build %install -%mvn_install -J build/javadoc +%mvn_install %files -n %{?module_prefix}%{name} -f .mfiles -%license LICENSE - -%files tck -f .mfiles-tck +%license LICENSE.txt NOTICE.md %changelog +* Sat May 16 2020 Mikolaj Izdebski - 1.0.1-1 +- Update to upstream version 1.0.1 + * Sat Jan 25 2020 Mikolaj Izdebski - 1-31.20100611svn86 - Build with OpenJDK 8 diff --git a/sources b/sources index ce6dbae..8f0137a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (atinject-1.tar.xz) = 45cef31ebfe7b3b7b327aa8aa5c06c86701071e14694f60df0a581c5d25e9691a92a27c31aee03c6226035b9d96b5a40cc8e4a490eea4ef23e289b8c36c60d49 -SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 +SHA512 (1.0.1.tar.gz) = bdbc0ae1e06574ebe5baf82d7f4ba7ea20d161cec893c687d60549b9f426134f8c6cc834774804a50de577e3a4327645e87560b79712febc51f9a7815de1d896 From cc83df56e00e8773a801bdb6ec7f4db091b0bdd3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 5 Oct 2020 11:47:05 +0200 Subject: [PATCH 10/11] Update to upstream version 1.0.3 --- .gitignore | 1 + atinject.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a0bae0..5475dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /noarch /*.src.rpm /1.0.1.tar.gz +/1.0.3.tar.gz diff --git a/atinject.spec b/atinject.spec index 3dc68cd..efdb9d2 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,5 +1,5 @@ Name: atinject -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: Dependency injection specification for Java (JSR-330) License: ASL 2.0 @@ -9,6 +9,7 @@ BuildArch: noarch Source0: https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description This package specifies a means for obtaining objects in such a way as @@ -39,6 +40,9 @@ beneficial to most nontrivial applications. %license LICENSE.txt NOTICE.md %changelog +* Mon Oct 05 2020 Mikolaj Izdebski - 1.0.3-1 +- Update to upstream version 1.0.3 + * Sat May 16 2020 Mikolaj Izdebski - 1.0.1-1 - Update to upstream version 1.0.1 diff --git a/sources b/sources index 8f0137a..1bf75dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.0.1.tar.gz) = bdbc0ae1e06574ebe5baf82d7f4ba7ea20d161cec893c687d60549b9f426134f8c6cc834774804a50de577e3a4327645e87560b79712febc51f9a7815de1d896 +SHA512 (1.0.3.tar.gz) = 394fefb51a8bc5e793870b9899bf2f946c2cb4d5a5d377e4bc8e8668c4b4419dd2afddbbf3bf3d0e3202625b60ff545671f363d927a8c6c3d09387ba519c29a4 From 26e7f679d35f1d978e5819162f54786e6b538b35 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 11/11] Conditionalize buildrequires in bootstrap mode --- atinject.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/atinject.spec b/atinject.spec index efdb9d2..f47b20c 100644 --- a/atinject.spec +++ b/atinject.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: atinject Version: 1.0.3 Release: 1%{?dist} @@ -9,7 +11,11 @@ BuildArch: noarch Source0: https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif %description This package specifies a means for obtaining objects in such a way as