.gitignore

@@ -1 +1 @@
-SOURCES/jtidy.tar.xz
+SOURCES/jtidy-code-r1261-trunk-jtidy.zip

.jtidy.metadata

@@ -1 +1 @@
-30053d4dcf957c4699ce25a9935d93b7a7982255 SOURCES/jtidy.tar.xz
+4c85a4da107a172f0ff8ea7cf3f46ba6f4bc9fe0 SOURCES/jtidy-code-r1261-trunk-jtidy.zip

SOURCES/jtidy.jtidy.script

@@ -1,26 +0,0 @@
-#!/bin/sh
-# 
-# JTidy script
-# JPackage Project <http://www.jpackage.org/>
-# $Id: jtidy.jtidy.script,v 1.1 2002/08/30 20:27:06 scop Exp $
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=org.w3c.tidy.Tidy
-BASE_JARS="jtidy"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

SPECS/jtidy.spec

@@ -1,19 +1,19 @@
 Name:             jtidy
 Version:          1.0
-Release:          0.28.20100930svn1125%{?dist}
+Release:          0.32.20101207svn1261%{?dist}
 Epoch:            2
 Summary:          HTML syntax checker and pretty printer
 License:          zlib
 URL:              http://jtidy.sourceforge.net/
-# svn export -r1125 https://jtidy.svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy
+Source0:          https://sourceforge.net/code-snapshots/svn/j/jt/jtidy/code/jtidy-code-r1261-trunk-jtidy.zip
-# tar caf jtidy.tar.xz jtidy
-Source0:          %{name}.tar.xz
-Source1:          %{name}.jtidy.script
 BuildArch:        noarch
 
-BuildRequires:    javapackages-local
+BuildRequires:  maven-local
-BuildRequires:    ant
+BuildRequires:  mvn(junit:junit)
-BuildRequires:    mvn(xerces:dom3-xml-apis)
+BuildRequires:  mvn(log4j:log4j:1.2.15)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.slf4j:slf4j-log4j12)
+
 # Explicit javapackages-tools requires since jtidy script uses
 # /usr/share/java-utils/java-functions
 Requires:         javapackages-tools
@@ -33,39 +33,39 @@ Summary:          API documentation for %{name}
 This package contains %{summary}.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-code-r1261-trunk-jtidy
+
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" 1.6
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" 1.6
 
 %build
-ant -Dant.build.javac.source=1.4
+%mvn_build
 
 %install
-%mvn_file : %{name}
+%mvn_install
-%mvn_alias : net.sf.jtidy:%{name}
-%mvn_artifact pom.xml target/%{name}-*.jar
-
-%mvn_install -J target/javadoc
-
-# shell script
-mkdir -p %{buildroot}%{_bindir}
-cp -ap %{SOURCE1} %{buildroot}%{_bindir}/%{name}
-
-# ant.d
-mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-jtidy
-EOF
 
+%jpackage_script 'org.w3c.tidy.Tidy' '' '' '"jtidy"' '%{name}'
 
 %files -f .mfiles
 %license LICENSE.txt
-%attr(755, root, root) %{_bindir}/*
+%{_bindir}/%{name}
-%config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
-
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2:1.0-0.32.20101207svn1261
+- Mass rebuild for javapackages-tools 201902
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2:1.0-0.31.20101207svn1261
+- Mass rebuild for javapackages-tools 201901
+
+* Fri Apr 26 2019 Marian Koncek <mkoncek@redhat.com> - 2:1.0-0.30.20101207svn1261
+- Update to upstream revision 1261
+
+* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2:1.0-0.29.20100930svn1125
+- Don't strip debugging symbols
+
 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2:1.0-0.28.20100930svn1125
 - Add requirement on javapackages-tools since jtidy script uses
   java-functions.