Compare commits

..

No commits in common. 'stream-javapackages-tools-202201-rhel-9.1.0' and 'c9' have entirely different histories.

37
.gitignore vendored

@ -1,35 +1,2 @@
/results_* SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
/*.src.rpm SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
/sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
/sisu-1.4.3.2.tar.gz
/sisu-2.1.1.tar.bz2
/sisu-2.2.3.tar.xz
/sisu-2.3.0.tar.xz
/sisu-2.3.0.tar.gz
/org.eclipse.sisu.inject-0.0.0.M4.tar.bz2
/org.eclipse.sisu.plexus-0.0.0.M4.tar.bz2
/org.eclipse.sisu.inject-0.0.0.M5.tar.bz2
/org.eclipse.sisu.plexus-0.0.0.M5.tar.bz2
/org.eclipse.sisu.inject-0.1.0.tar.bz2
/org.eclipse.sisu.plexus-0.1.0.tar.bz2
/org.eclipse.sisu.inject-0.1.1.tar.bz2
/org.eclipse.sisu.plexus-0.1.1.tar.bz2
/org.eclipse.sisu.inject-0.2.0.tar.bz2
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
/org.eclipse.sisu.inject-0.2.1.tar.bz2
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
/org.eclipse.sisu.inject-0.3.0.tar.bz2
/org.eclipse.sisu.plexus-0.3.0.tar.bz2
/org.eclipse.sisu.inject-0.3.1.tar.bz2
/org.eclipse.sisu.plexus-0.3.1.tar.bz2
/org.eclipse.sisu.inject-0.3.2.tar.bz2
/org.eclipse.sisu.plexus-0.3.2.tar.bz2
/org.eclipse.sisu.inject-0.3.3.tar.bz2
/org.eclipse.sisu.plexus-0.3.3.tar.bz2
/org.eclipse.sisu.inject-0.3.4.tar.gz
/org.eclipse.sisu.plexus-0.3.4.tar.gz
/org.eclipse.sisu.inject-0.3.5.tar.gz
/org.eclipse.sisu.plexus-0.3.5.tar.gz

@ -0,0 +1,2 @@
52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz

@ -2,17 +2,16 @@
Name: sisu Name: sisu
Epoch: 1 Epoch: 1
Version: 0.3.5 Version: 0.3.4
Release: 2%{?dist} Release: 12%{?dist}
Summary: Eclipse dependency injection framework Summary: Eclipse dependency injection framework
# sisu is EPL-1.0, the bundled asm is BSD # sisu is EPL-1.0, the bundled asm is BSD
License: EPL-1.0 and BSD License: EPL-1.0 and BSD
URL: https://eclipse.org/sisu/ URL: http://eclipse.org/sisu
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz 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: https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{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
Source100: sisu-parent.pom Source100: sisu-parent.pom
Source101: sisu-inject.pom Source101: sisu-inject.pom
@ -23,10 +22,10 @@ Patch2: sisu-ignored-tests.patch
Patch3: sisu-osgi-api.patch Patch3: sisu-osgi-api.patch
Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch
BuildRequires: maven-local-openjdk8
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap-openjdk8 BuildRequires: javapackages-bootstrap
%else %else
BuildRequires: maven-local-openjdk8
BuildRequires: mvn(com.google.inject.extensions:guice-servlet) BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
BuildRequires: mvn(com.google.inject:guice::no_aop:) BuildRequires: mvn(com.google.inject:guice::no_aop:)
BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.annotation:javax.annotation-api)
@ -41,9 +40,12 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
%endif %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}-inject = %{epoch}:%{version}-%{release}
Provides: %{name}-plexus = %{epoch}:%{version}-%{release} Provides: %{name}-plexus = %{epoch}:%{version}-%{release}
Provides: bundled(objectweb-asm)
%description %description
Java dependency injection framework with backward support for plexus and bean Java dependency injection framework with backward support for plexus and bean
@ -53,17 +55,17 @@ style dependency injection.
%prep %prep
%setup -q -c -T %setup -q -c -T
tar xf %{SOURCE0} && mv sisu.inject-releases-* sisu-inject tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
tar xf %{SOURCE1} && mv sisu.plexus-releases-* sisu-plexus tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
cp %{SOURCE100} pom.xml cp %{SOURCE100} pom.xml
cp %{SOURCE101} sisu-inject/pom.xml cp %{SOURCE101} sisu-inject/pom.xml
cp %{SOURCE102} sisu-plexus/pom.xml cp %{SOURCE102} sisu-plexus/pom.xml
%patch0 %patch -P 0
%patch2 %patch -P 2
%patch3 %patch -P 3
%patch4 -p1 %patch -P 4 -p1
%pom_remove_dep :servlet-api sisu-inject %pom_remove_dep :servlet-api sisu-inject
@ -84,20 +86,24 @@ cp %{SOURCE102} sisu-plexus/pom.xml
%license sisu-inject/LICENSE.txt %license sisu-inject/LICENSE.txt
%changelog %changelog
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-2 * Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - 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 May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-1 * Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-10
- Update to upstream version 0.3.5 - Rebuild to regenerate auto-requires
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:0.3.4-9 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.3.4-9
- Rebuilt for java-17-openjdk as system jdk - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-8 * Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuild to workaround DistroBaker issue
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-7 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Bootstrap Maven for CentOS Stream 9
* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-6 * Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-6
- Fix obsoletes on removed subpackages - Fix obsoletes on removed subpackages

@ -1,2 +0,0 @@
SHA512 (org.eclipse.sisu.inject-0.3.5.tar.gz) = 53efe8c948359eef9d9a569fc6e479e2747af06b8b36976edce52bae6100b0e3d01fa5b64ab55b24324dee5dac17d415c4e7bc150538e93c309341c99f65a7b8
SHA512 (org.eclipse.sisu.plexus-0.3.5.tar.gz) = 168d3ef5c501f8ea5846f101b5361a295c48ed1bb9fe51ed21b8dae935336dff4cf538f598f2b675f1431efdc6866eab642d45fc0d53a1d1578c358d2766f24b
Loading…
Cancel
Save