diff --git a/.felix-utils.metadata b/.felix-utils.metadata index 0ce2c57..ff08502 100644 --- a/.felix-utils.metadata +++ b/.felix-utils.metadata @@ -1 +1 @@ -d84f0ea491708d7866954f01761ef888a363144d SOURCES/org.apache.felix.utils-1.11.2-source-release.tar.gz +f756cc3dfbdb938dc184037b07cba0a56caea438 SOURCES/org.apache.felix.utils-1.11.8-source-release.tar.gz diff --git a/.gitignore b/.gitignore index 2fff651..392d32b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.apache.felix.utils-1.11.2-source-release.tar.gz +SOURCES/org.apache.felix.utils-1.11.8-source-release.tar.gz diff --git a/SPECS/felix-utils.spec b/SPECS/felix-utils.spec index d06cf11..24a2087 100644 --- a/SPECS/felix-utils.spec +++ b/SPECS/felix-utils.spec @@ -1,46 +1,52 @@ +%bcond_with bootstrap %global bundle org.apache.felix.utils Name: felix-utils -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.8 +Release: 21%{?dist} Summary: Utility classes for OSGi -License: ASL 2.0 -URL: http://felix.apache.org +License: Apache-2.0 +URL: https://felix.apache.org BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz +Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz # The module org.osgi.cmpn requires implementing methods which were not # implemented in previous versions where org.osgi.compendium was used -Patch0: 0000-Port-to-osgi-cmpn.patch +Patch: 0000-Port-to-osgi-cmpn.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) +%endif %description Utility classes for OSGi %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep -%setup -q -n %{bundle}-%{version} - -%patch0 -p1 +%autosetup -p1 -n %{bundle}-%{version} +%pom_remove_parent +%pom_xpath_inject pom:project "org.apache.felix" %pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :maven-compiler-plugin %mvn_file :%{bundle} "felix/%{bundle}" %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -53,18 +59,103 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.11.8-19 +- Update javapackages test plan to f42 + +* Wed Jul 17 2024 Fedora Release Engineering - 1.11.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.11.8-9 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1.11.8-8 +- Update Java source/target to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 1.11.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.11.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.11.8-5 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.11.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.11.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.11.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu May 12 2022 Mikolaj Izdebski - 1.11.8-1 +- Update to upstream version 1.11.8 + +* Sat Feb 05 2022 Jiri Vanek - 1.11.6-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.11.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.11.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.11.6-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Feb 02 2021 Fabio Valentini - 1.11.6-1 +- Update to version 1.11.6. + +* Tue Jan 26 2021 Fedora Release Engineering - 1.11.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Marian Koncek - 1.11.6-1 +- Update to upstream version 1.11.6 + +* Mon Jul 27 2020 Fedora Release Engineering - 1.11.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.11.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 1.11.4-1 +- Update to version 1.11.4. + +* Wed Jan 29 2020 Marian Koncek - 1.11.4-1 +- Update to upstream version 1.11.4 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 1.11.2-2 - Mass rebuild for javapackages-tools 201902 +* Sun Aug 18 2019 Fabio Valentini - 1.11.2-1 +- Update to version 1.11.2. + +* Sun Aug 18 2019 Fabio Valentini - 1.11.0-1 +- Update to version 1.11.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 1.10.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 22 2019 Marian Koncek - 1.11.2-1 - Update to upstream version 1.11.2 * Fri May 24 2019 Mikolaj Izdebski - 1.11.0-2 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 1.10.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 05 2018 Marian Koncek - 1.11.0-1 - Update to upstream version 1.11.0 +* Fri Jul 13 2018 Fedora Release Engineering - 1.10.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild