From a6de39fffe7193dfafb0ad11f1b1b930b7fa9e38 Mon Sep 17 00:00:00 2001 From: Aninda Date: Wed, 17 Dec 2025 22:27:25 -0500 Subject: [PATCH 1/4] fixed build issue by setting javac to use version 1.7 --- SPECS-EXTENDED/javacc/javacc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/javacc/javacc.spec b/SPECS-EXTENDED/javacc/javacc.spec index 262a360455f..71aa9dfba86 100644 --- a/SPECS-EXTENDED/javacc/javacc.spec +++ b/SPECS-EXTENDED/javacc/javacc.spec @@ -21,7 +21,7 @@ Distribution: Azure Linux Summary: A Parser and Scanner Generator for Java Name: javacc Version: 7.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause Group: Development/Libraries/Java URL: http://javacc.org @@ -84,7 +84,7 @@ find ./examples -type f -exec sed -i 's/\r//' {} \; %build %{ant} \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ jar javadoc %install @@ -127,6 +127,10 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh %{_javadocdir}/%{name} %changelog +* Wed Dec 17 2025 Aninda Pradhan - 7.0.4-4 +- Updated javac to use 1.8 to resolve build issues. +- License verified + * Sat Jul 24 2021 Pawel Winogrodzki - 7.0.4-3 - Splitting as separate 'javacc' package with a build-time dependency on 'javacc-bootstrap'. - Switching to using single digit 'Release' tags. From f62c318c1cd50d26f574aea3bdf2b55e107050e3 Mon Sep 17 00:00:00 2001 From: Aninda Date: Mon, 22 Dec 2025 13:58:37 -0500 Subject: [PATCH 2/4] Fixed license path warnings --- .../apache-commons-jexl/apache-commons-jexl.spec | 15 ++++++++++----- SPECS-EXTENDED/javacc/javacc.spec | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec index e0d9c62c0a1..9c9e288528d 100755 --- a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec +++ b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec @@ -4,7 +4,7 @@ Summary: Java Expression Language (JEXL) Name: apache-%{short_name} Version: 2.1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: Apache-2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -128,16 +128,21 @@ cp -pr jexl2-compat/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/jex test %files -f .mfiles -%license LICENSE.txt -%doc NOTICE.txt RELEASE-NOTES.txt +%license LICENSE.txt NOTICE.txt +%doc RELEASE-NOTES.txt %{_javadir}/%{short_name}*.jar %files javadoc -%license LICENSE.txt -%doc NOTICE.txt +%license LICENSE.txt NOTICE.txt +%license %{_javadocdir}/%{name}/jexl2-compat/legal/ADDITIONAL_LICENSE_INFO +%license %{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE %{_javadocdir}/%{name} %changelog +* Mon Dec 22 2025 Aninda Pradhan - 2.1.1-4 +- Fixed license path warnings +- License verified + * Mon Nov 14 2022 Sumedh Sharma - 2.1.1-3 - Fix build errors * create 'Packages' directory under JDK_HOME diff --git a/SPECS-EXTENDED/javacc/javacc.spec b/SPECS-EXTENDED/javacc/javacc.spec index 71aa9dfba86..c11c180f08d 100644 --- a/SPECS-EXTENDED/javacc/javacc.spec +++ b/SPECS-EXTENDED/javacc/javacc.spec @@ -123,12 +123,14 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %files javadoc -%license LICENSE +%license %{_javadocdir}/%{name}/legal/LICENSE +%license %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO %{_javadocdir}/%{name} %changelog * Wed Dec 17 2025 Aninda Pradhan - 7.0.4-4 - Updated javac to use 1.8 to resolve build issues. +- Fixed license path warnings - License verified * Sat Jul 24 2021 Pawel Winogrodzki - 7.0.4-3 From 13eeb03058b86db3f65305a43baf87c537317ccd Mon Sep 17 00:00:00 2001 From: Aninda Date: Wed, 24 Dec 2025 09:22:13 -0500 Subject: [PATCH 3/4] Fixes remaining license issues --- .../apache-commons-jexl.spec | 18 +++++++++++++++--- SPECS-EXTENDED/javacc/javacc.spec | 10 ++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec index 9c9e288528d..bf2ab1c6c26 100755 --- a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec +++ b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec @@ -114,6 +114,16 @@ install -pm 0644 jexl2-compat/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{sho install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/jexl2-compat cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr jexl2-compat/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/ + +# ensure jexl2-compat has an accessible license path (symlink to canonical) +if [ -f %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE ]; then + mkdir -p %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal + ln -sf /usr/share/javadoc/%{name}/legal/LICENSE %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE + ln -sf ../legal/LICENSE %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE +fi +# Remove any remaining ADDITIONAL_LICENSE_INFO (they are license-notes, not docs) +find %{buildroot}%{_javadocdir}/%{name} -type f -iname 'ADDITIONAL_LICENSE_INFO' -exec rm -f {} \; || true + %fdupes -s %{buildroot}%{_javadocdir} %check @@ -133,9 +143,11 @@ cp -pr jexl2-compat/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/jex %{_javadir}/%{short_name}*.jar %files javadoc -%license LICENSE.txt NOTICE.txt -%license %{_javadocdir}/%{name}/jexl2-compat/legal/ADDITIONAL_LICENSE_INFO -%license %{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE +%license %{_javadocdir}/%{name}/legal/LICENSE +%exclude %{_javadocdir}/%{name}/legal/LICENSE +%exclude %{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE +%exclude %{_javadocdir}/%{name}/**/ADDITIONAL_LICENSE_INFO +%exclude %{_javadocdir}/%{name}/ADDITIONAL_LICENSE_INFO %{_javadocdir}/%{name} %changelog diff --git a/SPECS-EXTENDED/javacc/javacc.spec b/SPECS-EXTENDED/javacc/javacc.spec index c11c180f08d..dbae0820883 100644 --- a/SPECS-EXTENDED/javacc/javacc.spec +++ b/SPECS-EXTENDED/javacc/javacc.spec @@ -99,6 +99,9 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ +# remove any stray ADDITIONAL_LICENSE_INFO files under javadoc legal/ dirs +find %{buildroot}%{_javadocdir} -type f -name 'ADDITIONAL_LICENSE_INFO' -exec rm -f {} \; || true + %fdupes -s %{buildroot}%{_javadocdir} %fdupes -s www %fdupes -s examples @@ -123,9 +126,12 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %files javadoc +# keep license metadata %license %{_javadocdir}/%{name}/legal/LICENSE -%license %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO -%{_javadocdir}/%{name} +# prevent wildcard from re-listing it +%exclude %{_javadocdir}/%{name}/legal/LICENSE +# include the rest of javadoc +%{_javadocdir}/%{name} %changelog * Wed Dec 17 2025 Aninda Pradhan - 7.0.4-4 From b0c0b6e0a2c1c25c0971a79f31d49b7a039cbec3 Mon Sep 17 00:00:00 2001 From: Aninda Date: Fri, 26 Dec 2025 22:49:08 -0500 Subject: [PATCH 4/4] Fixed symlink warnings --- .../apache-commons-jexl.spec | 39 ++++++++++++------- SPECS-EXTENDED/javacc/javacc.spec | 31 ++++++++++----- 2 files changed, 48 insertions(+), 22 deletions(-) mode change 100755 => 100644 SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec diff --git a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec old mode 100755 new mode 100644 index bf2ab1c6c26..da575850f59 --- a/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec +++ b/SPECS-EXTENDED/apache-commons-jexl/apache-commons-jexl.spec @@ -108,24 +108,40 @@ ln -sf %{name}/%{short_name}-compat.jar %{buildroot}%{_javadir}/%{short_name}-co install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom %add_maven_depmap %{name}/%{short_name}.pom %{name}/%{short_name}.jar -install -pm 0644 jexl2-compat/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom +install -pm 0644 jexl2-compat/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom %add_maven_depmap %{name}/%{short_name}-compat.pom %{name}/%{short_name}-compat.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/jexl2-compat cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr jexl2-compat/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/ -# ensure jexl2-compat has an accessible license path (symlink to canonical) -if [ -f %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE ]; then - mkdir -p %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal - ln -sf /usr/share/javadoc/%{name}/legal/LICENSE %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE - ln -sf ../legal/LICENSE %{buildroot}%{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE +# Extract LICENSE if present +legaldir=%{buildroot}%{_javadocdir}/%{name}/legal +if [ -d "$legaldir" ]; then + install -Dm 0644 $legaldir/LICENSE \ + %{buildroot}%{_licensedir}/apache-commons-jexl/LICENSE.javadoc fi -# Remove any remaining ADDITIONAL_LICENSE_INFO (they are license-notes, not docs) -find %{buildroot}%{_javadocdir}/%{name} -type f -iname 'ADDITIONAL_LICENSE_INFO' -exec rm -f {} \; || true +# Delete ALL legal/ dirs +find %{buildroot}%{_javadocdir}/%{name} -type d -name legal -exec rm -rf {} + + +# Run fdupes (this may create new symlinks) %fdupes -s %{buildroot}%{_javadocdir} +# Fix absolute symlinks inside jexl2-compat by rewriting relative to parent directory structure +pushd %{buildroot}%{_javadocdir}/%{name} +for f in $(find jexl2-compat -type l); do + tgt=$(readlink "$f") + if [[ "$tgt" = /* ]]; then + base=$(basename "$tgt") + # Compute depth-aware relative path + depth=$(dirname "$f" | awk -F/ '{ print NF-1 }') + rel=$(printf '../%.0s' $(seq 1 $depth))"$base" + ln -snf "$rel" "$f" + fi +done +popd + %check # commons-jexl %{ant} \ @@ -143,14 +159,11 @@ find %{buildroot}%{_javadocdir}/%{name} -type f -iname 'ADDITIONAL_LICENSE_INFO' %{_javadir}/%{short_name}*.jar %files javadoc -%license %{_javadocdir}/%{name}/legal/LICENSE -%exclude %{_javadocdir}/%{name}/legal/LICENSE -%exclude %{_javadocdir}/%{name}/jexl2-compat/legal/LICENSE -%exclude %{_javadocdir}/%{name}/**/ADDITIONAL_LICENSE_INFO -%exclude %{_javadocdir}/%{name}/ADDITIONAL_LICENSE_INFO +%license %{_licensedir}/apache-commons-jexl/LICENSE.javadoc %{_javadocdir}/%{name} %changelog + * Mon Dec 22 2025 Aninda Pradhan - 2.1.1-4 - Fixed license path warnings - License verified diff --git a/SPECS-EXTENDED/javacc/javacc.spec b/SPECS-EXTENDED/javacc/javacc.spec index dbae0820883..629cc51e2e1 100644 --- a/SPECS-EXTENDED/javacc/javacc.spec +++ b/SPECS-EXTENDED/javacc/javacc.spec @@ -99,15 +99,31 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ -# remove any stray ADDITIONAL_LICENSE_INFO files under javadoc legal/ dirs -find %{buildroot}%{_javadocdir} -type f -name 'ADDITIONAL_LICENSE_INFO' -exec rm -f {} \; || true + +# Move license-like files out of javadoc tree to avoid license warnings +legaldir=%{buildroot}%{_javadocdir}/%{name}/legal + +if [ -d "$legaldir" ]; then + # install renamed copies into licensedir + install -Dm 0644 $legaldir/LICENSE \ + %{buildroot}%{_licensedir}/javacc/LICENSE.javadoc + + install -Dm 0644 $legaldir/ADDITIONAL_LICENSE_INFO \ + %{buildroot}%{_licensedir}/javacc/ADDITIONAL_LICENSE_INFO.javadoc + + # remove the originals to avoid confusion + rm -rf $legaldir +fi + +# Remove all javadoc legal directories afterward +find %{buildroot}%{_javadocdir}/%{name} -type d -name legal %fdupes -s %{buildroot}%{_javadocdir} %fdupes -s www %fdupes -s examples %jpackage_script javacc '' '' javacc javacc true -ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh +ln -s javacc %{buildroot}%{_bindir}/javacc.sh %jpackage_script jjdoc '' '' javacc jjdoc true %jpackage_script jjtree '' '' javacc jjtree true @@ -126,12 +142,9 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %files javadoc -# keep license metadata -%license %{_javadocdir}/%{name}/legal/LICENSE -# prevent wildcard from re-listing it -%exclude %{_javadocdir}/%{name}/legal/LICENSE -# include the rest of javadoc -%{_javadocdir}/%{name} +%license LICENSE +%doc %{_javadocdir}/%{name} +%license %{_licensedir}/javacc/* %changelog * Wed Dec 17 2025 Aninda Pradhan - 7.0.4-4