Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jtidy for openSUSE:Factory checked in at 2022-03-28 16:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jtidy (Old) and /work/SRC/openSUSE:Factory/.jtidy.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jtidy" Mon Mar 28 16:59:32 2022 rev:20 rq:963250 version:8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jtidy/jtidy.changes 2018-11-10 16:47:18.088651200 +0100 +++ /work/SRC/openSUSE:Factory/.jtidy.new.1900/jtidy.changes 2022-03-28 17:00:05.840931568 +0200 @@ -1,0 +2,6 @@ +Sun Mar 20 12:39:53 UTC 2022 - Fridrich Strba <[email protected]> + +- Build with java source and target levels 8 +- Rewamp and simplify the build system + +------------------------------------------------------------------- Old: ---- build.xml jtidy.jtidy.script maven-build.properties maven-build.xml New: ---- jtidy-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jtidy.spec ++++++ --- /var/tmp/diff_new_pack.NfU18t/_old 2022-03-28 17:00:06.320932220 +0200 +++ /var/tmp/diff_new_pack.NfU18t/_new 2022-03-28 17:00:06.320932220 +0200 @@ -1,7 +1,7 @@ # # spec file for package jtidy # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,10 +34,7 @@ # # bnc#501764 # rm jtidy/src/config/clover.license Source0: jtidy-r813.tar.bz2 -Source1: %{name}.jtidy.script -Source2: build.xml -Source3: maven-build.properties -Source4: maven-build.xml +Source1: jtidy-build.xml BuildRequires: ant >= 1.6 BuildRequires: ant-junit BuildRequires: fdupes @@ -78,33 +75,19 @@ %prep %setup -q -n %{name} -cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} . - -sed -i 's/charset="ISO-8859-1"/charset="UTF-8"/' maven-build.xml +cp -p %{SOURCE1} build.xml %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL -if [ `uname -m` = "ppc64" -o `uname -m` = "ppc64le" ];then -export ANT_OPTS="-Xss2m" -else -export ANT_OPTS="-Xss1m" -fi -export CLASSPATH=$(build-classpath junit slf4j xerces-j2 xml-commons-jaxp-1.3-apis):`pwd`/target/classes:`pwd`/target/test-classes -export OPT_JAR_LIST="junit ant/ant-junit" +mkdir -p lib +build-jar-repository -s lib xerces-j2 xml-commons-jaxp-1.3-apis %{ant} \ - -Dbuild.sysclasspath=only \ - -Dmaven.mode.offline=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.skip=true \ - -Dmaven.test.error.ignore=true \ package javadoc %install # jar install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -117,25 +100,17 @@ %fdupes -s %{buildroot}%{_javadocdir}/%{name} # shell script -install -d -m 0755 %{buildroot}%{_bindir} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} +%jpackage_script org.w3c.tidy.Tidy "" "" %{name}:xerces-j2:xml-apis %{name} true # ant.d install -d -m 0755 %{buildroot}%{_sysconfdir}/ant.d cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF -jtidy xerces-j2 xml-commons-jaxp-1.3-apis +jtidy xerces-j2 xml-apis EOF -%files -%defattr(0644,root,root,0755) +%files -f .mfiles %license LICENSE.txt %{_javadir}/%{name}.jar -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %config(noreplace) %{_sysconfdir}/ant.d/%{name} %files javadoc ++++++ jtidy-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="jtidy" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property name="build.finalName" value="jtidy-8.0"/> <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"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> <fileset dir="lib"> <include name="**/*"/> </fileset> </path> <!-- ====================================================================== --> <!-- 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="UTF8" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.8" verbose="false" fork="false" source="1.8"> <src> <pathelement location="${build.srcDir}"/> </src> <classpath refid="build.classpath"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> </copy> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" source="1.8" encoding="UTF8" 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="Main-Class" value="org.w3c.tidy.Tidy"/> </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>
