Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package picocli for openSUSE:Factory checked in at 2022-06-25 10:24:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picocli (Old) and /work/SRC/openSUSE:Factory/.picocli.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "picocli" Sat Jun 25 10:24:08 2022 rev:3 rq:984861 version:4.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/picocli/picocli.changes 2022-01-19 00:35:28.354302353 +0100 +++ /work/SRC/openSUSE:Factory/.picocli.new.1548/picocli.changes 2022-06-25 10:24:17.918676874 +0200 @@ -1,0 +2,5 @@ +Fri Jun 24 09:48:56 UTC 2022 - Fridrich Strba <[email protected]> + +- Build picocli using ant to avoid cycles + +------------------------------------------------------------------- New: ---- picocli-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picocli.spec ++++++ --- /var/tmp/diff_new_pack.CRAFaL/_old 2022-06-25 10:24:18.466677656 +0200 +++ /var/tmp/diff_new_pack.CRAFaL/_new 2022-06-25 10:24:18.470677662 +0200 @@ -24,9 +24,11 @@ Group: Development/Libraries/Java URL: https://picocli.info/ Source0: https://github.com/remkop/%{name}/archive/v%{version}.tar.gz +Source1: %{name}-build.xml +BuildRequires: ant BuildRequires: aqute-bnd BuildRequires: fdupes -BuildRequires: maven-local +BuildRequires: javapackages-local BuildArch: noarch %description @@ -44,9 +46,10 @@ %prep %setup -q -n %{name}-%{version} %pom_xpath_set pom:project/pom:version %{version} +cp %{SOURCE1} build.xml %build -%mvn_build -f +%ant jar javadoc # Convert to OSGi bundle bnd wrap \ --bsn %{name} \ @@ -57,14 +60,24 @@ mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar %install -%mvn_install +#jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +#pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +#javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE %doc README.md -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE %changelog ++++++ picocli-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="picocli" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property file="build.properties"/> <property name="project.artifactId" value="picocli"/> <property name="project.version" value="4.6.2"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <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/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> <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}" nowarn="false" debug="true" optimize="false" deprecation="true" 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" 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" charset="ISO-8859-1" 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"/> </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>
