Skip to content

Commit e2b84da

Browse files
authored
Build fix for package junitperf (microsoft#12575)
1 parent de2b272 commit e2b84da

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

SPECS-EXTENDED/junitperf/junitperf.spec

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Distribution: Azure Linux
2222

2323
Name: junitperf
2424
Version: 1.9.1
25-
Release: 27%{?dist}
25+
Release: 28%{?dist}
2626
Summary: JUnit extension for performance and scalability testing
2727
License: BSD
2828
Group: Development/Libraries/Java
@@ -79,8 +79,8 @@ find . -name "*.jar" | xargs -t rm
7979
export CLASSPATH=
8080
export OPT_JAR_LIST="junit ant/ant-junit"
8181
# performance tests sometimes failed on build farm, so lets disable them to avoid unpredictable build fails
82-
#ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar test javadoc
83-
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar javadoc
82+
#ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 -Dbuild.sysclasspath=first jar test javadoc
83+
ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 -Dbuild.sysclasspath=first jar javadoc
8484

8585
%install
8686
# jars
@@ -90,18 +90,27 @@ install -p -m 0644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name
9090
# javadoc
9191
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
9292
cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
93+
install -D -m 0644 build/docs/api/legal/ADDITIONAL_LICENSE_INFO \
94+
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/legal/ADDITIONAL_LICENSE_INFO
95+
install -D -m 0644 build/docs/api/legal/ADDITIONAL_LICENSE_INFO \
96+
$RPM_BUILD_ROOT%{_licensedir}/%{name}-javadoc/ADDITIONAL_LICENSE_INFO
9397
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
9498
# demo
9599
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
96100
cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
97101

98102
%files
99103
%defattr(0644,root,root,0755)
100-
%doc LICENSE README docs/JUnitPerf.html
104+
%license LICENSE
105+
%doc README docs/JUnitPerf.html
101106
%{_javadir}/%{name}.jar
102107
%{_javadir}/%{name}-%{version}.jar
103108

104109
%files javadoc
110+
%license LICENSE
111+
%license %{_licensedir}/%{name}-javadoc/ADDITIONAL_LICENSE_INFO
112+
%exclude /usr/share/javadoc/junitperf-1.9.1/legal/ADDITIONAL_LICENSE_INFO
113+
%exclude /usr/share/javadoc/junitperf-1.9.1/legal/LICENSE
105114
%defattr(0644,root,root,0755)
106115
%{_javadocdir}/%{name}-%{version}
107116
%{_javadocdir}/%{name}
@@ -111,6 +120,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
111120
%{_datadir}/%{name}
112121

113122
%changelog
123+
* Mon Feb 24 2025 Akarsh Chaudhary <[email protected]> - 1.9.1-28
124+
- Bumped build option to 8.
125+
114126
* Thu Dec 16 2021 Pawel Winogrodzki <[email protected]> - 1.9.1-27
115127
- Removing the explicit %%clean stage.
116128
- License verified.

0 commit comments

Comments
 (0)