oro: Build error fix (microsoft#12676)

Co-authored-by: Sandeep Karambelkar <[email protected]>

Author: durgajagadeesh

SPECS-EXTENDED/oro/oro.signatures.json

@@ -3,4 +3,4 @@
   "jakarta-oro-2.0.8.tar.gz": "4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566",
   "oro-2.0.8.pom": "9aa9dfeb2e85e1d5e7932c87140697cecc2b0fadd933d679fd420a2e43831a82"
  }
-}
+}

SPECS-EXTENDED/oro/oro.spec

@@ -21,13 +21,14 @@ Distribution:   Azure Linux
 %define full_name	jakarta-%{name}
 Name:           oro
 Version:        2.0.8
-Release:        297%{?dist}
+Release:        298%{?dist}
 Summary:        Full regular expressions API
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://jakarta.apache.org/oro/
-Source0:        http://archive.apache.org/dist/jakarta/oro/%{full_name}-%{version}.tar.gz
-Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+Url:            https://jakarta.apache.org/oro/
+Source0:        https://archive.apache.org/dist/jakarta/oro/source/%{full_name}-%{version}.tar.gz
+Source1:        https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local-bootstrap
@@ -64,7 +65,7 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 
 %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 \
 	-Dfinal.name=%{name} jar javadocs
 
 %install
@@ -79,18 +80,28 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}/
+mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
 %fdupes %{buildroot}%{_javadocdir}
 
+# Remove LICENSE from javadoc directory to avoid duplicate license warning
+rm -f %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE
+
 %files -f .mfiles
 %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS STYLE
 %license LICENSE
+%license ADDITIONAL_LICENSE_INFO
 %{_javadir}/%{full_name}.jar
 
 %files javadoc
-%license LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Feb 28 2025 Durga Jagadeesh Palli <[email protected]> - 2.0.8-298
+- Build error fix, bump up the java source version from 1.6 to 1.8.
+- Fixed duplicate LICENSE warning
+- Marked extra legal files as documentation
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.0.8-297
 - Converting the 'Release' tag to the '[number].[distribution]' format.
 

cgmanifest.json

@@ -15694,7 +15694,7 @@
         "other": {
           "name": "oro",
           "version": "2.0.8",
-          "downloadUrl": "http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz"
+          "downloadUrl": "https://archive.apache.org/dist/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz"
         }
       }
     },