Skip to content

Commit a882e60

Browse files
committed
Reset SPECS folders to clean 3.0-dev baseline
Cherry-picked SPECS, SPECS-EXTENDED, and SPECS-SIGNED from origin/3.0-dev to ensure a clean baseline for testing while preserving all .pipelines/prchecks development work.
1 parent 2697b76 commit a882e60

File tree

455 files changed

+58953
-8442
lines changed

Some content is hidden

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

455 files changed

+58953
-8442
lines changed

SPECS-EXTENDED/389-ds-base/389-ds-base.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ExcludeArch: i686
6868
Summary: 389 Directory Server (%{variant})
6969
Name: 389-ds-base
7070
Version: 3.1.1
71-
Release: 5%{?dist}
71+
Release: 7%{?dist}
7272
License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
7373
URL: https://www.port389.org
7474
Vendor: Microsoft Corporation
@@ -732,6 +732,12 @@ exit 0
732732
%endif
733733

734734
%changelog
735+
* Fri Aug 08 2025 Azure Linux Security Servicing Account <[email protected]> - 3.1.1-7
736+
- Bump release to rebuild with rust
737+
738+
* Mon Jul 21 2025 Jyoti Kanase <[email protected]> - 3.1.1-6
739+
- Bump release to rebuild with rust
740+
735741
* Fri Jun 13 2025 Kavya Sree Kaitepalli <[email protected]> - 3.1.1-5
736742
- Bump release to rebuild with rust
737743

SPECS-EXTENDED/apache-commons-pool2/apache-commons-pool2.spec

Lines changed: 20 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Apache Commons Pool 2.x series
44
Name: apache-commons-pool2
55
Version: 2.4.2
6-
Release: 7%{?dist}
6+
Release: 8%{?dist}
77
License: Apache-2.0
88
Vendor: Microsoft Corporation
99
Distribution: Azure Linux
@@ -12,12 +12,11 @@ URL: https://commons.apache.org/proper/commons-pool/
1212
Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
1313
Patch0: jakarta-commons-pool-build.patch
1414
BuildRequires: ant
15-
BuildRequires: ant-junit
1615
BuildRequires: cglib
1716
BuildRequires: fdupes
1817
BuildRequires: java-devel >= 1.8
19-
BuildRequires: javapackages-local-bootstrap
20-
BuildRequires: xml-commons-apis
18+
BuildRequires: javapackages-local-bootstrap >= 6
19+
BuildRequires: junit
2120
Requires: cglib
2221
Provides: %{short_name} = %{version}
2322
Obsoletes: %{short_name} < %{version}
@@ -44,55 +43,46 @@ This package contains the javadoc documentation for the Apache Commons
4443
Pool 2.x Package.
4544

4645
%prep
47-
%autosetup -p0 -n %{short_name}-%{version}-src
46+
%setup -q -n %{short_name}-%{version}-src
4847
# remove all binary libs
49-
find . -name "*.jar" -exec rm -f {} \;
50-
51-
%pom_remove_parent .
52-
%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .
48+
find . -name "*.jar" -print -delete
49+
%patch -P 0
5350

5451
%build
55-
export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-util)
56-
%{ant} -Dbuild.sysclasspath=first clean dist
52+
echo "cglib.jar=$(build-classpath cglib)" >> build.properties
53+
ant \
54+
-Djavac.target.version=8 -Djavac.src.version=8 \
55+
-Djava.io.tmpdir=. clean dist
5756

5857
%install
5958
# jars
6059
install -d -m 755 %{buildroot}%{_javadir}
61-
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
62-
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
63-
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
60+
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
61+
ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
6462
# pom
6563
install -d -m 755 %{buildroot}%{_mavenpomdir}
66-
install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
67-
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
64+
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
65+
%add_maven_depmap %{name}.pom %{name}.jar
6866

6967
# javadoc
7068
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
7169
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
7270
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
7371

74-
%check
75-
export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-util)
76-
%{ant} -Dbuild.sysclasspath=first test
77-
78-
%files
72+
%files -f .mfiles
7973
%license LICENSE.txt
8074
%doc README.txt
81-
%{_javadir}/%{name}.jar
82-
%{_javadir}/%{name}-%{version}.jar
8375
%{_javadir}/%{short_name}.jar
84-
%{_javadir}/%{short_name}-%{version}.jar
85-
%{_mavenpomdir}/%{name}-%{version}.pom
86-
%if %{defined _maven_repository}
87-
%{_mavendepmapfragdir}/%{name}
88-
%else
89-
%{_datadir}/maven-metadata/%{name}.xml*
90-
%endif
9176

9277
%files javadoc
9378
%doc %{_javadocdir}/%{name}
79+
%exclude /usr/share/javadoc/%{name}/legal
9480

9581
%changelog
82+
* Wed May 28 2025 Durga Jagadeesh Palli <[email protected]> - 2.4.2-8
83+
- Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag).
84+
- License verified
85+
9686
* Wed Nov 09 2022 Sumedh Sharma <[email protected]> - 2.4.2-7
9787
- Enable check section
9888
- License verified
@@ -107,32 +97,25 @@ export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tre
10797
* Mon Mar 25 2019 Fridrich Strba <[email protected]>
10898
- Remove pom parent, since we don't use it when not building with
10999
maven
110-
111100
* Thu Dec 13 2018 Fridrich Strba <[email protected]>
112101
- Add maven pom file
113-
114102
* Tue May 15 2018 [email protected]
115103
- Build with source and target 8 to prepare for a possible removal
116104
of 1.6 compatibility
117105
- Run fdupes on documentation
118-
119106
* Thu Sep 14 2017 [email protected]
120107
- Fix javadoc build
121-
122108
* Thu Sep 29 2016 [email protected]
123109
- Version update to 2.4.2 release from pool2:
124110
* rename to latest 2.x pool series for dbcp and other packages
125-
126111
* Thu Sep 29 2016 [email protected]
127112
- Rename from jakarta-commons-pool to apache-commons-pool
128113
- Version update to 1.6:
129114
* drop the tomcat5 package, we need pool2 to work with new tomcat
130115
* Last and final from the pool1 series, new pool2 was introduced
131116
for future developement.
132-
133117
* Mon Sep 9 2013 [email protected]
134118
- Move from jpackage-utils to javapackage-tools
135-
136119
* Thu Mar 13 2008 [email protected]
137120
- merged with jpackage 1.7
138121
- update to 1.3
@@ -147,21 +130,15 @@ export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tre
147130
- provides and obsoletes of main package contains the version
148131
- new tomcat5 subpackage
149132
- new manual subpackage (build only with maven)
150-
151133
* Fri Sep 15 2006 [email protected]
152134
- set source=1.4 for java
153-
154135
* Wed Jan 25 2006 [email protected]
155136
- converted neededforbuild to BuildRequires
156-
157137
* Thu Jul 28 2005 [email protected]
158138
- Adjustments in the spec file.
159-
160139
* Mon Jul 18 2005 [email protected]
161140
- Current version 1.2 from JPackage.org
162-
163141
* Thu Sep 16 2004 [email protected]
164142
- Fix prerequires of javadoc subpackage
165-
166143
* Thu Sep 2 2004 [email protected]
167144
- Initial package created with version 1.2 (JPackage 1.5)

SPECS-EXTENDED/args4j/args4j.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Group: Development/Libraries/Java
2828
URL: https://args4j.kohsuke.org
2929
Source0: https://github.com/kohsuke/%{name}/archive/%{name}-site-%{version}.tar.gz
3030
Source1: %{name}-build.tar.xz
31+
Patch0: change-source-option-to-1.8.patch
3132
BuildRequires: ant
3233
BuildRequires: fdupes
3334
BuildRequires: java-devel
@@ -65,7 +66,7 @@ Group: Documentation/HTML
6566
This package contains the API documentation for %{name}.
6667

6768
%prep
68-
%setup -q -n %{name}-%{name}-site-%{version} -a 1
69+
%autosetup -a1 -p1 -n %{name}-%{name}-site-%{version}
6970

7071
# removing classpath addition
7172
sed -i 's/<addClasspath>true/<addClasspath>false/g' %{name}-tools/pom.xml
@@ -136,6 +137,10 @@ cp -r %{name}-tools/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{nam
136137
%license %{name}/LICENSE.txt
137138

138139
%changelog
140+
* Fri Jul 18 2025 Sumit Jena <[email protected]> - 2.33.3
141+
- Patch to change source and target options as build fix
142+
- License verified
143+
139144
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.33-2
140145
- Converting the 'Release' tag to the '[number].[distribution]' format.
141146

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From e9080c1382570c9b028b60210ad0779a10a82ab2 Mon Sep 17 00:00:00 2001
2+
From: SumitJenaHCL <[email protected]>
3+
Date: Thu, 10 Jul 2025 05:15:48 +0000
4+
Subject: [PATCH] change source option to 1.8
5+
6+
---
7+
common.xml | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/common.xml b/common.xml
11+
index 37d36f4..d3486a0 100644
12+
--- a/common.xml
13+
+++ b/common.xml
14+
@@ -7,7 +7,7 @@
15+
<property name="project.groupId" value="args4j"/>
16+
<property name="bundle.version" value="${project.version}.0"/>
17+
18+
- <property name="compiler.source" value="1.6"/>
19+
+ <property name="compiler.source" value="1.8"/>
20+
<property name="compiler.target" value="${compiler.source}"/>
21+
22+
</project>
23+
--
24+
2.45.2
25+

0 commit comments

Comments
 (0)