|
|
|
|
@ -1,36 +1,37 @@
|
|
|
|
|
%bcond_with bootstrap
|
|
|
|
|
# Release type, either "milestone" or "release"
|
|
|
|
|
%global reltype release
|
|
|
|
|
#global reltag .M1
|
|
|
|
|
|
|
|
|
|
Name: sisu
|
|
|
|
|
Epoch: 1
|
|
|
|
|
Version: 0.3.4
|
|
|
|
|
Release: 12%{?dist}
|
|
|
|
|
Version: 0.3.3
|
|
|
|
|
Release: 6%{?dist}
|
|
|
|
|
Summary: Eclipse dependency injection framework
|
|
|
|
|
# sisu is EPL-1.0, the bundled asm is BSD
|
|
|
|
|
# sisu is EPL-1.0
|
|
|
|
|
# bundled asm is BSD
|
|
|
|
|
License: EPL-1.0 and BSD
|
|
|
|
|
URL: http://eclipse.org/sisu
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz
|
|
|
|
|
Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz
|
|
|
|
|
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.bz2
|
|
|
|
|
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.bz2
|
|
|
|
|
|
|
|
|
|
Source100: %{name}-parent.pom
|
|
|
|
|
Source101: %{name}-inject.pom
|
|
|
|
|
Source102: %{name}-plexus.pom
|
|
|
|
|
|
|
|
|
|
Source100: sisu-parent.pom
|
|
|
|
|
Source101: sisu-inject.pom
|
|
|
|
|
Source102: sisu-plexus.pom
|
|
|
|
|
Patch0: %{name}-OSGi-import-guava.patch
|
|
|
|
|
Patch2: %{name}-ignored-tests.patch
|
|
|
|
|
Patch3: %{name}-osgi-api.patch
|
|
|
|
|
|
|
|
|
|
Patch0: sisu-OSGi-import-guava.patch
|
|
|
|
|
Patch2: sisu-ignored-tests.patch
|
|
|
|
|
Patch3: sisu-osgi-api.patch
|
|
|
|
|
Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
BuildRequires: maven-local-openjdk8
|
|
|
|
|
%if %{with bootstrap}
|
|
|
|
|
BuildRequires: javapackages-bootstrap
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: maven-local
|
|
|
|
|
BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
|
|
|
|
|
BuildRequires: mvn(com.google.inject:guice::no_aop:)
|
|
|
|
|
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
|
|
|
|
BuildRequires: mvn(javax.enterprise:cdi-api)
|
|
|
|
|
BuildRequires: mvn(javax.inject:javax.inject)
|
|
|
|
|
BuildRequires: mvn(javax.servlet:servlet-api)
|
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
|
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
|
|
|
|
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
|
|
|
|
@ -38,41 +39,50 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
|
|
|
|
BuildRequires: mvn(org.osgi:osgi.core)
|
|
|
|
|
BuildRequires: mvn(org.slf4j:slf4j-api)
|
|
|
|
|
BuildRequires: mvn(org.testng:testng)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
Provides: bundled(objectweb-asm)
|
|
|
|
|
|
|
|
|
|
Obsoletes: %{name}-inject < 1:0.3.4-5
|
|
|
|
|
Obsoletes: %{name}-plexus < 1:0.3.4-5
|
|
|
|
|
Provides: %{name}-inject = %{epoch}:%{version}-%{release}
|
|
|
|
|
Provides: %{name}-plexus = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
Java dependency injection framework with backward support for plexus and bean
|
|
|
|
|
style dependency injection.
|
|
|
|
|
|
|
|
|
|
%{?javadoc_package}
|
|
|
|
|
%package inject
|
|
|
|
|
Summary: Sisu inject
|
|
|
|
|
Obsoletes: %{name}-tests < 1:0.3.2-5
|
|
|
|
|
|
|
|
|
|
%description inject
|
|
|
|
|
This package contains %{summary}.
|
|
|
|
|
|
|
|
|
|
%package plexus
|
|
|
|
|
Summary: Sisu Plexus
|
|
|
|
|
|
|
|
|
|
%description plexus
|
|
|
|
|
This package contains %{summary}.
|
|
|
|
|
|
|
|
|
|
%package javadoc
|
|
|
|
|
Summary: API documentation for Sisu
|
|
|
|
|
|
|
|
|
|
%description javadoc
|
|
|
|
|
This package contains %{summary}.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -c -T
|
|
|
|
|
tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
|
|
|
|
|
tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
|
|
|
|
|
tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
|
|
|
|
|
tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
|
|
|
|
|
|
|
|
|
|
cp %{SOURCE100} pom.xml
|
|
|
|
|
cp %{SOURCE101} sisu-inject/pom.xml
|
|
|
|
|
cp %{SOURCE102} sisu-plexus/pom.xml
|
|
|
|
|
|
|
|
|
|
%patch -P 0
|
|
|
|
|
%patch -P 2
|
|
|
|
|
%patch -P 3
|
|
|
|
|
%patch -P 4 -p1
|
|
|
|
|
|
|
|
|
|
%pom_remove_dep :servlet-api sisu-inject
|
|
|
|
|
%patch0
|
|
|
|
|
%patch2
|
|
|
|
|
%patch3
|
|
|
|
|
|
|
|
|
|
%pom_xpath_set -r /pom:project/pom:version %{version}
|
|
|
|
|
|
|
|
|
|
%mvn_file ":{*}" @1
|
|
|
|
|
%mvn_package ":*{inject,plexus}"
|
|
|
|
|
%mvn_package ":*{inject,plexus}" @1
|
|
|
|
|
%mvn_package : __noinstall
|
|
|
|
|
%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
|
|
|
|
|
|
|
|
|
|
@ -82,72 +92,16 @@ cp %{SOURCE102} sisu-plexus/pom.xml
|
|
|
|
|
%install
|
|
|
|
|
%mvn_install
|
|
|
|
|
|
|
|
|
|
%files -f .mfiles
|
|
|
|
|
%license sisu-inject/LICENSE.txt
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.4-12
|
|
|
|
|
- Fix patch usage
|
|
|
|
|
|
|
|
|
|
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.4-11
|
|
|
|
|
- Rebuild with regenerated Requires on Java
|
|
|
|
|
|
|
|
|
|
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-10
|
|
|
|
|
- Rebuild to regenerate auto-requires
|
|
|
|
|
|
|
|
|
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.3.4-9
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
%files inject -f .mfiles-inject
|
|
|
|
|
%doc sisu-inject/LICENSE.txt
|
|
|
|
|
|
|
|
|
|
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-8
|
|
|
|
|
- Rebuild to workaround DistroBaker issue
|
|
|
|
|
%files plexus -f .mfiles-plexus
|
|
|
|
|
|
|
|
|
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-7
|
|
|
|
|
- Bootstrap Maven for CentOS Stream 9
|
|
|
|
|
%files javadoc -f .mfiles-javadoc
|
|
|
|
|
%doc sisu-inject/LICENSE.txt
|
|
|
|
|
|
|
|
|
|
* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-6
|
|
|
|
|
- Fix obsoletes on removed subpackages
|
|
|
|
|
|
|
|
|
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-5
|
|
|
|
|
- Bootstrap build
|
|
|
|
|
- Non-bootstrap build
|
|
|
|
|
|
|
|
|
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.3.4-2
|
|
|
|
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
|
|
|
|
|
|
|
|
|
* Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 1:0.3.4-1
|
|
|
|
|
- Update to version 0.3.4.
|
|
|
|
|
|
|
|
|
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-9
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
|
|
|
|
|
- Build with OpenJDK 8
|
|
|
|
|
|
|
|
|
|
* Wed Nov 06 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-1
|
|
|
|
|
- Update to upstream version 0.3.4
|
|
|
|
|
|
|
|
|
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
|
|
|
|
|
- Mass rebuild for javapackages-tools 201902
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-8
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
|
|
|
|
|
- Merge inject and plexus subpackages
|
|
|
|
|
|
|
|
|
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
|
|
|
|
|
- Mass rebuild for javapackages-tools 201901
|
|
|
|
|
|
|
|
|
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-7
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
|
|
|
|
|
- Declare bundled objectweb-asm
|
|
|
|
|
- Fix license tag to include BSD for asm
|
|
|
|
|
|
