Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ed25519-java for openSUSE:Factory checked in at 2024-10-31 16:09:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ed25519-java (Old) and /work/SRC/openSUSE:Factory/.ed25519-java.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ed25519-java" Thu Oct 31 16:09:22 2024 rev:5 rq:1219529 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ed25519-java/ed25519-java.changes 2024-02-21 17:59:43.046465350 +0100 +++ /work/SRC/openSUSE:Factory/.ed25519-java.new.2020/ed25519-java.changes 2024-10-31 16:09:44.628013492 +0100 @@ -1,0 +2,5 @@ +Wed Oct 30 09:18:41 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Rewrite the build using ant + +------------------------------------------------------------------- New: ---- ed25519-java-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ed25519-java.spec ++++++ --- /var/tmp/diff_new_pack.f5s9xV/_old 2024-10-31 16:09:45.580053444 +0100 +++ /var/tmp/diff_new_pack.f5s9xV/_new 2024-10-31 16:09:45.580053444 +0100 @@ -16,6 +16,7 @@ # +%global artifactId eddsa Name: ed25519-java Version: 0.3.0 Release: 0 @@ -23,12 +24,13 @@ License: CC0-1.0 URL: https://github.com/str4d/ed25519-java Source0: https://github.com/str4d/ed25519-java/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: %{name}-build.xml Patch0: 0001-EdDSAEngine.initVerify-Handle-any-non-EdDSAPublicKey.patch Patch1: 0002-Disable-test-that-relies-on-internal-sun-JDK-classes.patch +BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -52,37 +54,36 @@ %prep %setup -q +cp %{SOURCE1} build.xml %patch -P 0 -p1 %patch -P 1 -p1 -# Unwanted tasks -%pom_remove_plugin :maven-gpg-plugin -%pom_remove_plugin :maven-javadoc-plugin -%pom_remove_plugin :maven-source-plugin -# Unavailable plugin -%pom_remove_plugin :nexus-staging-maven-plugin -# Make dep on sun.security.x509 optional, inject an Import-Package directive -%pom_xpath_inject "pom:configuration/pom:instructions" \ - "<Import-Package>sun.security.x509;resolution:=optional,*</Import-Package>" - -%{mvn_file} net.i2p.crypto:eddsa %{name} eddsa - %build -%{mvn_build} -f -- \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ -%endif - -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ - -Dsource=8 +ant jar javadoc %install -%mvn_install + +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{artifactId}.jar +ln -sf %{_javadir}/%{artifactId}.jar %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{artifactId}.pom +%add_maven_depmap %{artifactId}.pom %{artifactId}.jar + +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles +%{_javadir}/%{name}.jar %doc README.md %license LICENSE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE.txt ++++++ ed25519-java-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="eddsa" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> <property name="project.groupId" value="net.i2p.crypto"/> <property name="project.artifactId" value="eddsa"/> <property name="project.version" value="0.3.0"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> <delete dir="${build.dir}"/> </target> <!-- ====================================================================== --> <!-- Compilation target --> <!-- ====================================================================== --> <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir}"/> </src> </javac> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" encoding="UTF-8" source="${compiler.source}" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" linksource="false" breakiterator="false"/> </target> <!-- ====================================================================== --> <!-- Package target --> <!-- ====================================================================== --> <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" basedir="${build.outputDir}" excludes="**/package.html"> <manifest> <attribute name="Automatic-Module-Name" value="${project.groupId}.${project.artifactId}"/> <attribute name="Bundle-Description" value="Implementation of EdDSA in Java"/> <attribute name="Bundle-License" value="https://creativecommons.org/publicdomain/zero/1.0/"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="EdDSA-Java"/> <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="net.i2p.crypto.eddsa.spec;version="${project.version}",net.i2p.crypto.eddsa;uses:="net.i2p.crypto.eddsa.spec";version="${project.version}""/> <attribute name="Import-Package" value="sun.security.x509;resolution:=optional"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> </manifest> </jar> </target> <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== --> <target name="jar" depends="package" description="Builds the jar for the application"/> </project>