Skip to content

Commit e6e8f15

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents ba754a3 + 0de902e commit e6e8f15

File tree

182 files changed

+7076
-2947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+7076
-2947
lines changed

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@
890890
"marisa",
891891
"maven-compiler-plugin",
892892
"maven-jar-plugin",
893+
"maven-parent",
893894
"maven-resolver",
894895
"maven-resources-plugin",
895896
"maven-surefire",
@@ -2612,7 +2613,6 @@
26122613
"libva",
26132614
"libvdpau",
26142615
"lynx",
2615-
"maven-parent",
26162616
"multus",
26172617
"objectweb-anttask",
26182618
"objectweb-asm",
@@ -2763,7 +2763,7 @@
27632763
"gnutls",
27642764
"gobject-introspection",
27652765
"golang",
2766-
"golang-1.22",
2766+
"golang-1.23",
27672767
"gperf",
27682768
"gperftools",
27692769
"gpgme",

‎SPECS-EXTENDED/apache-commons-daemon/apache-commons-daemon-build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<property name="project.artifactId" value="commons-daemon" />
88
<property name="project.version" value="1.2.3" />
99

10-
<property name="compiler.source" value="1.6" />
10+
<property name="compiler.source" value="1.8" />
1111
<property name="compiler.target" value="${compiler.source}" />
1212

1313
<property name="build.finalName" value="${project.artifactId}-${project.version}" />

‎SPECS-EXTENDED/apache-commons-daemon/apache-commons-daemon.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"Signatures": {
3-
"apache-commons-daemon-build.xml": "967a05bbd089c5c475818fb464e3b10b47b85d3a473d224a6bb5d4efc9fc0baf",
3+
"apache-commons-daemon-build.xml": "948f55c15e5fc3879a53f577700223d5ed767cbd76b3f62ee37da6684927a597",
44
"apache-commons-daemon.keyring": "c79fd010016d480581a97453b640971899a806a4a848695411f66f100330964e",
55
"commons-daemon-1.2.3-src.tar.gz": "37b8c461c52e76c1ed6cd290431237611dfe496df36cd70e5afa30659d9bce4c",
66
"commons-daemon-1.2.3-src.tar.gz.asc": "a91cdf4d0ad90c17d2dbf367ce722722977561a752056ffc4b1600844c2c719c"
77
}
8-
}
8+
}

‎SPECS-EXTENDED/apache-commons-daemon/apache-commons-daemon.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Distribution: Azure Linux
2121
%define short_name commons-daemon
2222
Name: apache-%{short_name}
2323
Version: 1.2.3
24-
Release: 2%{?dist}
24+
Release: 3%{?dist}
2525
Summary: Commons Daemon - Controlling of Java Daemons
2626
License: Apache-2.0
2727
Group: System/Daemons
@@ -142,6 +142,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
142142
%{_javadocdir}/%{name}
143143

144144
%changelog
145+
* Thu Feb 27 2025 Durga Jagadeesh Palli <[email protected]> - 1.2.3-3
146+
- Build error fix, bump up the java source version from 1.6 to 1.8.
147+
- License verified
148+
145149
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 1.2.3-2
146150
- Converting the 'Release' tag to the '[number].[distribution]' format.
147151

‎SPECS-EXTENDED/bats/bats.signatures.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"Signatures": {
3-
"bats-core-1.2.1.tar.gz": "91c49b1fe6f0656c46491929ed728f8dfa9a96df0cce294963e8c6082bff87a2"
3+
"bats-core-1.11.0.tar.gz": "aeff09fdc8b0c88b3087c99de00cf549356d7a2f6a69e3fcec5e0e861d2f9063"
44
}
55
}
6+

‎SPECS-EXTENDED/bats/bats.spec

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Distribution: Azure Linux
33
%global upstreamname bats-core
44

55
Name: bats
6-
Version: 1.2.1
7-
Release: 2%{?dist}
6+
Version: 1.11.0
7+
Release: 1%{?dist}
88
Summary: Bash Automated Testing System
99

1010
License: MIT
@@ -44,6 +44,10 @@ program.
4444
%{_mandir}/man7/%{name}.7.gz
4545

4646
%changelog
47+
* Thu Oct 10 2024 Kevin Lockwood <[email protected]> - 1.11.0-1
48+
- Update to current upstream
49+
- License Verified
50+
4751
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.2.1-2
4852
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
4953

‎SPECS-EXTENDED/cim-schema/cim-schema.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"LICENSE": "7864f0e2d5f202bfcc5987d19de661142865fd5e7a20aa0d3e08cf766c93d36b",
4-
"cim_schema_2.43.0Experimental-Doc.zip": "face0ad7d5997dd562d0bee63ddd9d02954d6546de973406593bdb038e8caa6d",
5-
"cim_schema_2.43.0Experimental-MOFs.zip": "d861bacaf1c88658b23cc9d713b2e437403c4b9558941e6c9f99b122582e08f8"
4+
"cim_schema_2.54.1Experimental-Doc.zip": "4d1fd82a8caf5465ba69b3bd2af4deebcd3edb5f5f3d40de9e5327a8e346f7ae",
5+
"cim_schema_2.54.1Experimental-MOFs.zip": "929fed54e04cc705fefac95d89910800e964e85e20252204d5c3dcb54f55f22e"
66
}
77
}

‎SPECS-EXTENDED/cim-schema/cim-schema.spec

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ Distribution: Azure Linux
3434
# norootforbuild
3535

3636
%global major 2
37-
%global minor 43
38-
%global update 0
37+
%global minor 54
38+
%global update 1
3939

4040
Name: cim-schema
4141
Url: http://www.dmtf.org/
4242
Summary: Common Information Model (CIM) Schema
4343
Version: %{major}.%{minor}.%{update}
44-
Release: 11%{?dist}
45-
License: DMTF
44+
Release: 6%{?dist}
45+
License: LicenseRef-DMTF
4646
Source0: http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-MOFs.zip
4747
Source1: http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-Doc.zip
4848
Source2: LICENSE
@@ -101,8 +101,48 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name}
101101
%doc ../%{name}-docs/*
102102

103103
%changelog
104-
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 2.43.0-11
105-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
104+
* Tue Dec 17 2024 Akarsh Chaudhary <[email protected]> - 2.54.1-6
105+
- Initial Azure Linux import from Fedora 41 (license: MIT).
106+
- License verified
107+
108+
* Wed Jul 17 2024 Fedora Release Engineering <[email protected]> - 2.54.1-5
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
110+
111+
* Tue Jan 23 2024 Fedora Release Engineering <[email protected]> - 2.54.1-4
112+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
113+
114+
* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 2.54.1-3
115+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
116+
117+
* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 2.54.1-2
118+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
119+
120+
* Fri May 19 2023 Vitezslav Crhonek <[email protected]> - 2.54.1-1
121+
- Update to CIM Schema 2.54.1, including experimental classes
122+
123+
* Tue Mar 28 2023 Vitezslav Crhonek <[email protected]> - 2.54.0-6
124+
- SPDX migration
125+
126+
* Wed Jan 18 2023 Fedora Release Engineering <[email protected]> - 2.54.0-5
127+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
128+
129+
* Wed Jul 20 2022 Fedora Release Engineering <[email protected]> - 2.54.0-4
130+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
131+
132+
* Wed Jan 19 2022 Fedora Release Engineering <[email protected]> - 2.54.0-3
133+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
134+
135+
* Wed Jul 21 2021 Fedora Release Engineering <[email protected]> - 2.54.0-2
136+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
137+
138+
* Wed Apr 21 2021 Vitezslav Crhonek <[email protected]> - 2.54.0-1
139+
- Update to CIM Schema 2.54.0, including experimental classes
140+
141+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 2.43.0-12
142+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
143+
144+
* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 2.43.0-11
145+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
106146

107147
* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 2.43.0-10
108148
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

‎SPECS-EXTENDED/cim-schema/cim_schema_2.54.1Experimental-Doc.zip

3.23 MB
Binary file not shown.

0 commit comments

Comments
 (0)