From 5beb5de09d2212c64f50ffe9a2987d616df3d0b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 01/14] Switch from %setup to %autosetup --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 4468270..95cded8 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -118,7 +118,7 @@ and above. This package provides Bill of Materials module for Guice. %{?javadoc_package} %prep -%setup -q +%autosetup -p1 -C %java_remove_annotations core/src/ \ -p ^com.google.common.annotations. \ From 3d952fb483aadf7ca855b001d12d1738639d0a20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:04 +0200 Subject: [PATCH 02/14] Convert to %autorelease and %autochangelog --- changelog | 313 +++++++++++++++++++++++++++++++++++++++++++++ google-guice.spec | 316 +--------------------------------------------- 2 files changed, 315 insertions(+), 314 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..06ff0e2 --- /dev/null +++ b/changelog @@ -0,0 +1,313 @@ +* Tue Jul 30 2024 Mikolaj Izdebski - 5.1.0-13 +- Drop unneeded Obsoletes + +* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 +- Convert License tag to SPDX format + +* Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 +- Build with Jurand instead of deprecated javapackages-extra + +* Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 +- Build with default JDK 17 + +* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 +- Rebuild with no changes + +* Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 +- Update to upstream version 5.1.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 +- Bump release + +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 18 2020 Marian Koncek - 4.2.3-1 +- Update to upstream version 4.2.3 + +* Tue Jul 28 2020 Fedora Release Engineering - 4.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 4.2.3-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri May 08 2020 Fabio Valentini - 4.2.3-1 +- Update to version 4.2.3. + +* Wed Jan 29 2020 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 +- Mass rebuild for javapackages-tools 201902 + +* Mon Jul 29 2019 Fabio Valentini - 4.2.2-1 +- Update to version 4.2.2. +- Obsolete guice-testlib. + +* Fri Jul 26 2019 Fabio Valentini - 4.1-16 +- Disable support for spring and JPA. + +* Thu Jul 25 2019 Fedora Release Engineering - 4.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 +- Mass rebuild for javapackages-tools 201901 + +* Fri Apr 05 2019 Marian Koncek - 4.2.2-1 +- Update to upstream version 4.2.2 +- Fixes: RHBZ #1563661 + +* Fri Feb 01 2019 Fedora Release Engineering - 4.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Mat Booth - 4.1-13 +- Regenerate OSGi metadata due to ASM 7 + +* Fri Jul 13 2018 Fedora Release Engineering - 4.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Apr 18 2018 Mikolaj Izdebski - 4.1-11 +- Remove legacy Provides + +* Wed Feb 07 2018 Fedora Release Engineering - 4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Michael Simacek - 4.1-9 +- Use guava20 + +* Mon Oct 02 2017 Mat Booth - 4.1-8 +- Fix OSGi metadata to import cglib and asm, since we are not bundling them with + jarjar + +* Wed Jul 26 2017 Fedora Release Engineering - 4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 23 2017 Mikolaj Izdebski - 4.1-6 +- Remove unused patches + +* Fri Feb 24 2017 Mikolaj Izdebski - 4.1-5 +- Remove maven-javadoc-plugin from all POMs + +* Thu Feb 23 2017 Mikolaj Izdebski - 4.1-4 +- Add missing BR on apache-resource-bundles + +* Fri Feb 10 2017 Fedora Release Engineering - 4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.1-2 +- Introduce build-conditionals for jpa and spring + +* Thu Aug 4 2016 Mikolaj Izdebski - 4.1-1 +- Update to upstream version 4.1 + +* Wed Jun 29 2016 Mikolaj Izdebski - 4.0-6 +- Make aopalliance dependency optional + +* Wed Jun 15 2016 Mikolaj Izdebski - 4.0-5 +- Regenerate build-requires + +* Wed Feb 03 2016 Fedora Release Engineering - 4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 12 2016 Mikolaj Izdebski - 4.0-3 +- Install BOM even when without extensions + +* Wed Jun 17 2015 Fedora Release Engineering - 4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 4.0-1 +- Update to upstream version 4.0 + +* Mon Apr 27 2015 Mikolaj Izdebski - 3.2.6-1 +- Update to upstream version 3.2.6 + +* Fri Mar 6 2015 Alexander Kurtakov 3.2.5-2 +- Drop gone tomcat-servlet-3.0-api BR, builds fine without it. + +* Fri Jan 23 2015 Michael Simacek - 3.2.5-1 +- Update to upstream version 3.2.5 + +* Mon Sep 29 2014 Mikolaj Izdebski - 3.2.4-1 +- Update to upstream version 3.2.4 + +* Fri Jun 6 2014 Mikolaj Izdebski - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Wed May 28 2014 Mikolaj Izdebski - 3.2.1-2 +- Rebuild to regenerate Maven auto-requires + +* Wed Apr 16 2014 Mikolaj Izdebski - 3.2.1-1 +- Update to upstream version 3.2.1 +- Add testlib subpackage + +* Tue Mar 4 2014 Mikolaj Izdebski - 3.1.10-3 +- Fix directory ownership + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1.10-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 3.1.10-2 +- Fix unowned directory + +* Tue Feb 18 2014 Mikolaj Izdebski - 3.1.10-1 +- Update to upstream version 3.1.10 + +* Mon Jan 20 2014 Mikolaj Izdebski - 3.1.9-1 +- Update to upstream version 3.1.9 + +* Mon Nov 11 2013 Mikolaj Izdebski - 3.1.8-1 +- Update to upstream version 3.1.8 + +* Wed Oct 23 2013 Mikolaj Izdebski - 3.1.3-10 +- Rebuild to regenerate broken POMs +- Related: rhbz#1021484 + +* Fri Oct 18 2013 Mikolaj Izdebski - 3.1.3-9 +- Don't force generation of pom.properties + +* Wed Sep 25 2013 Mikolaj Izdebski - 3.1.3-8 +- Install no_aop artifact after javapackages update + +* Thu Sep 12 2013 Stanislav Ochotnicky - 3.1.3-7 +- Remove dependency on tests from runtime +- Related: rhbz#1007498 + +* Tue Sep 10 2013 Mikolaj Izdebski - 3.1.3-6 +- Install no_aop artifact +- Resolves: rhbz#1006491 + +* Wed Sep 4 2013 Mikolaj Izdebski - 3.1.3-5 +- Enable pom.properties +- Resolves: rhbz#1004360 + +* Wed Aug 07 2013 Michal Srb - 3.1.3-4 +- Add create-tarball.sh script to SRPM + +* Sat Aug 03 2013 Fedora Release Engineering - 3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 24 2013 Michal Srb - 3.1.3-2 +- Revert update to 3.1.4 (uses asm4) + +* Thu Mar 14 2013 Michal Srb - 3.1.3-1 +- Update to upstream version 3.1.3 +- Remove bundled JARs from tarball + +* Wed Feb 06 2013 Java SIG - 3.1.2-11 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Jan 31 2013 Michal Srb - 3.1.2-10 +- Remove all requires +- Correct usage of xmvn's macros + +* Mon Jan 28 2013 Michal Srb - 3.1.2-9 +- Build with xmvn + +* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-8 +- Remove README + +* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-7 +- Repackage tarball + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-6 +- Don't try to build extension modules unless they are needed + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-5 +- Conditionalize %%install section too + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-4 +- Conditionally disable extensions + +* Thu Nov 1 2012 Mikolaj Izdebski - 3.1.2-3 +- Update to new add_maven_depmap macro + +* Wed Oct 31 2012 Stanislav Ochotnicky - 3.1.2-2 +- Use new generated maven filelist feature from javapackages-tools + +* Fri Oct 5 2012 Mikolaj Izdebski - 3.1.2-1 +- Complete rewrite of the spec file +- New upstream, to ease future maintenance +- Build with maven instead of ant +- Split into multiple subpackages + +* Thu Jul 19 2012 Fedora Release Engineering - 3.0-0.7.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 9 2012 Stanislav Ochotnicky - 3.0-0.6.rc2 +- Temporary fix for maven buildroots + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0-0.5.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Oct 12 2011 Stanislav Ochotnicky - 3.0-0.4.rc2 +- Build with aqute-bnd (#745176) +- Use new maven macros +- Few packaging tweaks + +* Tue May 24 2011 Stanislav Ochotnicky - 3.0-0.3.rc2 +- Add cglib and atinject to R + +* Thu May 12 2011 Stanislav Ochotnicky - 3.0-0.2.rc2 +- Remove test and missing deps from pom.xml + +* Tue Mar 1 2011 Stanislav Ochotnicky - 3.0-0.1.rc2 +- Update to 3.0rc2 +- Changes according to new guidelines (versionless jars & javadocs) + +* Tue Feb 08 2011 Fedora Release Engineering - 2.0-4.1219svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 14 2010 Stanislav Ochotnicky - 2.0-3.1219svn +- Add java-devel >= 1:1.6.0 to BR + +* Wed Oct 13 2010 Stanislav Ochotnicky - 2.0-2.1219svn +- Moved munge repacking to prep +- Added -Dversion to change generated manifest version +- Removed http part of URL + +* Thu Oct 7 2010 Stanislav Ochotnicky - 2.0-1.1219svn +- Initial version of the package diff --git a/google-guice.spec b/google-guice.spec index 95cded8..2d5d024 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 13%{?dist} +Release: %autorelease Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -199,316 +199,4 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog -* Tue Jul 30 2024 Mikolaj Izdebski - 5.1.0-13 -- Drop unneeded Obsoletes - -* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 -- bump of release for for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 -- Convert License tag to SPDX format - -* Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 -- Build with Jurand instead of deprecated javapackages-extra - -* Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 -- Build with default JDK 17 - -* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 -- Rebuild with no changes - -* Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 -- Update to upstream version 5.1.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 -- Bump release - -* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Sep 18 2020 Marian Koncek - 4.2.3-1 -- Update to upstream version 4.2.3 - -* Tue Jul 28 2020 Fedora Release Engineering - 4.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 4.2.3-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri May 08 2020 Fabio Valentini - 4.2.3-1 -- Update to version 4.2.3. - -* Wed Jan 29 2020 Fedora Release Engineering - 4.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 -- Mass rebuild for javapackages-tools 201902 - -* Mon Jul 29 2019 Fabio Valentini - 4.2.2-1 -- Update to version 4.2.2. -- Obsolete guice-testlib. - -* Fri Jul 26 2019 Fabio Valentini - 4.1-16 -- Disable support for spring and JPA. - -* Thu Jul 25 2019 Fedora Release Engineering - 4.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 -- Mass rebuild for javapackages-tools 201901 - -* Fri Apr 05 2019 Marian Koncek - 4.2.2-1 -- Update to upstream version 4.2.2 -- Fixes: RHBZ #1563661 - -* Fri Feb 01 2019 Fedora Release Engineering - 4.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Mat Booth - 4.1-13 -- Regenerate OSGi metadata due to ASM 7 - -* Fri Jul 13 2018 Fedora Release Engineering - 4.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 18 2018 Mikolaj Izdebski - 4.1-11 -- Remove legacy Provides - -* Wed Feb 07 2018 Fedora Release Engineering - 4.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Michael Simacek - 4.1-9 -- Use guava20 - -* Mon Oct 02 2017 Mat Booth - 4.1-8 -- Fix OSGi metadata to import cglib and asm, since we are not bundling them with - jarjar - -* Wed Jul 26 2017 Fedora Release Engineering - 4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 23 2017 Mikolaj Izdebski - 4.1-6 -- Remove unused patches - -* Fri Feb 24 2017 Mikolaj Izdebski - 4.1-5 -- Remove maven-javadoc-plugin from all POMs - -* Thu Feb 23 2017 Mikolaj Izdebski - 4.1-4 -- Add missing BR on apache-resource-bundles - -* Fri Feb 10 2017 Fedora Release Engineering - 4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 1 2017 Mikolaj Izdebski - 4.1-2 -- Introduce build-conditionals for jpa and spring - -* Thu Aug 4 2016 Mikolaj Izdebski - 4.1-1 -- Update to upstream version 4.1 - -* Wed Jun 29 2016 Mikolaj Izdebski - 4.0-6 -- Make aopalliance dependency optional - -* Wed Jun 15 2016 Mikolaj Izdebski - 4.0-5 -- Regenerate build-requires - -* Wed Feb 03 2016 Fedora Release Engineering - 4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 12 2016 Mikolaj Izdebski - 4.0-3 -- Install BOM even when without extensions - -* Wed Jun 17 2015 Fedora Release Engineering - 4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 4.0-1 -- Update to upstream version 4.0 - -* Mon Apr 27 2015 Mikolaj Izdebski - 3.2.6-1 -- Update to upstream version 3.2.6 - -* Fri Mar 6 2015 Alexander Kurtakov 3.2.5-2 -- Drop gone tomcat-servlet-3.0-api BR, builds fine without it. - -* Fri Jan 23 2015 Michael Simacek - 3.2.5-1 -- Update to upstream version 3.2.5 - -* Mon Sep 29 2014 Mikolaj Izdebski - 3.2.4-1 -- Update to upstream version 3.2.4 - -* Fri Jun 6 2014 Mikolaj Izdebski - 3.2.2-1 -- Update to upstream version 3.2.2 - -* Wed May 28 2014 Mikolaj Izdebski - 3.2.1-2 -- Rebuild to regenerate Maven auto-requires - -* Wed Apr 16 2014 Mikolaj Izdebski - 3.2.1-1 -- Update to upstream version 3.2.1 -- Add testlib subpackage - -* Tue Mar 4 2014 Mikolaj Izdebski - 3.1.10-3 -- Fix directory ownership - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1.10-3 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Feb 19 2014 Mikolaj Izdebski - 3.1.10-2 -- Fix unowned directory - -* Tue Feb 18 2014 Mikolaj Izdebski - 3.1.10-1 -- Update to upstream version 3.1.10 - -* Mon Jan 20 2014 Mikolaj Izdebski - 3.1.9-1 -- Update to upstream version 3.1.9 - -* Mon Nov 11 2013 Mikolaj Izdebski - 3.1.8-1 -- Update to upstream version 3.1.8 - -* Wed Oct 23 2013 Mikolaj Izdebski - 3.1.3-10 -- Rebuild to regenerate broken POMs -- Related: rhbz#1021484 - -* Fri Oct 18 2013 Mikolaj Izdebski - 3.1.3-9 -- Don't force generation of pom.properties - -* Wed Sep 25 2013 Mikolaj Izdebski - 3.1.3-8 -- Install no_aop artifact after javapackages update - -* Thu Sep 12 2013 Stanislav Ochotnicky - 3.1.3-7 -- Remove dependency on tests from runtime -- Related: rhbz#1007498 - -* Tue Sep 10 2013 Mikolaj Izdebski - 3.1.3-6 -- Install no_aop artifact -- Resolves: rhbz#1006491 - -* Wed Sep 4 2013 Mikolaj Izdebski - 3.1.3-5 -- Enable pom.properties -- Resolves: rhbz#1004360 - -* Wed Aug 07 2013 Michal Srb - 3.1.3-4 -- Add create-tarball.sh script to SRPM - -* Sat Aug 03 2013 Fedora Release Engineering - 3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Apr 24 2013 Michal Srb - 3.1.3-2 -- Revert update to 3.1.4 (uses asm4) - -* Thu Mar 14 2013 Michal Srb - 3.1.3-1 -- Update to upstream version 3.1.3 -- Remove bundled JARs from tarball - -* Wed Feb 06 2013 Java SIG - 3.1.2-11 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Jan 31 2013 Michal Srb - 3.1.2-10 -- Remove all requires -- Correct usage of xmvn's macros - -* Mon Jan 28 2013 Michal Srb - 3.1.2-9 -- Build with xmvn - -* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-8 -- Remove README - -* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-7 -- Repackage tarball - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-6 -- Don't try to build extension modules unless they are needed - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-5 -- Conditionalize %%install section too - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-4 -- Conditionally disable extensions - -* Thu Nov 1 2012 Mikolaj Izdebski - 3.1.2-3 -- Update to new add_maven_depmap macro - -* Wed Oct 31 2012 Stanislav Ochotnicky - 3.1.2-2 -- Use new generated maven filelist feature from javapackages-tools - -* Fri Oct 5 2012 Mikolaj Izdebski - 3.1.2-1 -- Complete rewrite of the spec file -- New upstream, to ease future maintenance -- Build with maven instead of ant -- Split into multiple subpackages - -* Thu Jul 19 2012 Fedora Release Engineering - 3.0-0.7.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 9 2012 Stanislav Ochotnicky - 3.0-0.6.rc2 -- Temporary fix for maven buildroots - -* Fri Jan 13 2012 Fedora Release Engineering - 3.0-0.5.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 12 2011 Stanislav Ochotnicky - 3.0-0.4.rc2 -- Build with aqute-bnd (#745176) -- Use new maven macros -- Few packaging tweaks - -* Tue May 24 2011 Stanislav Ochotnicky - 3.0-0.3.rc2 -- Add cglib and atinject to R - -* Thu May 12 2011 Stanislav Ochotnicky - 3.0-0.2.rc2 -- Remove test and missing deps from pom.xml - -* Tue Mar 1 2011 Stanislav Ochotnicky - 3.0-0.1.rc2 -- Update to 3.0rc2 -- Changes according to new guidelines (versionless jars & javadocs) - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0-4.1219svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 14 2010 Stanislav Ochotnicky - 2.0-3.1219svn -- Add java-devel >= 1:1.6.0 to BR - -* Wed Oct 13 2010 Stanislav Ochotnicky - 2.0-2.1219svn -- Moved munge repacking to prep -- Added -Dversion to change generated manifest version -- Removed http part of URL - -* Thu Oct 7 2010 Stanislav Ochotnicky - 2.0-1.1219svn -- Initial version of the package +%autochangelog From 6952a5ab2fb2317e45cda856cbe19b223b38b01f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 03/14] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 82512746e85ab832c7b4fa583a6d4fb3cc94d5f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 04/14] Unify spec style with the rest of Java/Maven packages [skip changelog] --- google-guice.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 2d5d024..8db667c 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -27,8 +27,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif -# xmvn-builddep misses this: %if %{without bootstrap} +# xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif BuildRequires: jurand @@ -189,11 +189,17 @@ and above. This package provides Bill of Materials module for Guice. %license COPYING %files -n guice-assistedinject -f .mfiles-guice-assistedinject + %files -n guice-extensions -f .mfiles-extensions-parent + %files -n guice-grapher -f .mfiles-guice-grapher + %files -n guice-jmx -f .mfiles-guice-jmx + %files -n guice-jndi -f .mfiles-guice-jndi + %files -n guice-servlet -f .mfiles-guice-servlet + %files -n guice-throwingproviders -f .mfiles-guice-throwingproviders %files -n guice-bom -f .mfiles-guice-bom From f13c59c97ab52fa432025fcf43a096837d4b3270 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 05/14] Sort dependencies [skip changelog] --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 8db667c..779a479 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -13,6 +13,7 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh +BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -31,7 +32,6 @@ BuildRequires: mvn(org.ow2.asm:asm) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif -BuildRequires: jurand %description Put simply, Guice alleviates the need for factories and the use of new From 5548e49ce959da09e3ed3987f4a2db653beabff8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 06/14] Explicitly declare javadoc subpackage [skip changelog] --- google-guice.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 779a479..e57adaa 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -115,7 +115,11 @@ Summary: Bill of Materials for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Bill of Materials module for Guice. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -204,5 +208,8 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom +%files javadoc -f .mfiles-javadoc +%license COPYING + %changelog %autochangelog From 68b438154b37b2f89df86be935b419fbb2b690c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 04:51:27 +0000 Subject: [PATCH 07/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c5193e442df609a81067a3be7cf6fab326a2e34b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 16 Feb 2025 17:17:20 +0100 Subject: [PATCH 08/14] Add classes alias --- google-guice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google-guice.spec b/google-guice.spec index e57adaa..125fa5f 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -172,6 +172,8 @@ API documentation for %{name}. #%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "provided" extensions +%mvn_alias :guice :::classes: + %build #%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" From 0f9650b1d9cd4019629843b9d36bfd5f0d45ff07 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 09/14] Remove javadoc subpackage --- google-guice.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 125fa5f..d9b59af 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -32,6 +32,8 @@ BuildRequires: mvn(org.ow2.asm:asm) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 5.1.0-27 %description Put simply, Guice alleviates the need for factories and the use of new @@ -115,12 +117,6 @@ Summary: Bill of Materials for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Bill of Materials module for Guice. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -184,7 +180,7 @@ API documentation for %{name}. %mvn_file ":guice" guice/%{name} %{name} #%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice" # Skip tests because of missing dependency guice-testlib -%mvn_build -f -s +%mvn_build -j -f -s %install %mvn_install @@ -210,8 +206,5 @@ API documentation for %{name}. %files -n guice-bom -f .mfiles-guice-bom -%files javadoc -f .mfiles-javadoc -%license COPYING - %changelog %autochangelog From ba01846bc95ce1508ebb1a99eb3cbcca45f126cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 10/14] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 886ca0dbed43b173389f68498c9a1fcd5fc18b1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 11/14] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From ebfe1da389ab682a49c0c12efeb4e9e9a7f8e1c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 12/14] Build with OpenJDK 25 --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index d9b59af..1ce6ef4 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -17,7 +17,7 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(aopalliance:aopalliance) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.guava:guava) From 30ffc7c9ff6c6faf7e62cc9349ff45a4d77018d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:24:53 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5d78b12e8344b9f814a0af76adad70e181f73ec0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 20:50:18 +0200 Subject: [PATCH 14/14] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.