From 1afc895fb378f54c63c23051568d994d6a774fa841e557e7a21c1eb385d642e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 14:07:31 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main jtidy revision eb11fa7edf2ebe6504f7a60b4f8df8df --- .gitattributes | 23 +++++++++ jtidy-1.0.4.tar.gz | 3 ++ jtidy-build.xml | 111 +++++++++++++++++++++++++++++++++++++++++++ jtidy-rpmlintrc | 1 + jtidy.changes | 70 +++++++++++++++++++++++++++ jtidy.spec | 115 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 323 insertions(+) create mode 100644 .gitattributes create mode 100644 jtidy-1.0.4.tar.gz create mode 100644 jtidy-build.xml create mode 100644 jtidy-rpmlintrc create mode 100644 jtidy.changes create mode 100644 jtidy.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/jtidy-1.0.4.tar.gz b/jtidy-1.0.4.tar.gz new file mode 100644 index 0000000..b374dc3 --- /dev/null +++ b/jtidy-1.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df3eca7077a1290f1e9b633422a3d8ac4f2fc5a0f487a129a193d58b039ea45 +size 684942 diff --git a/jtidy-build.xml b/jtidy-build.xml new file mode 100644 index 0000000..aa5c844 --- /dev/null +++ b/jtidy-build.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jtidy-rpmlintrc b/jtidy-rpmlintrc new file mode 100644 index 0000000..e0f074c --- /dev/null +++ b/jtidy-rpmlintrc @@ -0,0 +1 @@ +addFilter("invalid-license") diff --git a/jtidy.changes b/jtidy.changes new file mode 100644 index 0000000..eba97ef --- /dev/null +++ b/jtidy.changes @@ -0,0 +1,70 @@ +------------------------------------------------------------------- +Mon Feb 19 12:39:44 UTC 2024 - Fridrich Strba + +- The license is actually HTMLTIDY +- Add rpmlintrc to avoid errors with that license tag on SLE-15-SP2 +- Clean the spec file + +------------------------------------------------------------------- +Mon Jul 24 19:53:59 UTC 2023 - Fridrich Strba + +- Add epoch to make upgrades from 8.0 to 1.0.x easier + +------------------------------------------------------------------- +Mon Jul 24 14:15:22 UTC 2023 - Gus Kenion + +- Update upstream from abandoned sourceforge to actively maintained + github +- bsc#1212404 (CVE-2023-34623): Prevent crash when parsing + documents with excessive nesting. (community fix, part of v1.0.4) + +------------------------------------------------------------------- +Sun Mar 20 12:39:53 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 +- Rewamp and simplify the build system + +------------------------------------------------------------------- +Mon Oct 29 09:36:38 UTC 2018 - Fridrich Strba + +- Fix javadoc build +- Package maven artifact + +------------------------------------------------------------------- +Fri Sep 8 08:34:01 UTC 2017 - fstrba@suse.com + +- Modified file: + * maven-build.xml + + Specify java source and target level 1.6 in order to allow + building with jdk9 + +------------------------------------------------------------------- +Thu Dec 5 19:41:32 UTC 2013 - dvaleev@suse.com + +- increase stack size for ppc64le + +------------------------------------------------------------------- +Mon Sep 9 11:06:07 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Wed Dec 12 17:02:32 UTC 2012 - dvaleev@suse.com + +- increase stack size for ppc64 + +------------------------------------------------------------------- +Fri Jun 15 13:39:06 UTC 2012 - mvyskocil@suse.cz + +- disable javadoc (workaround for jdk7 build) + +------------------------------------------------------------------- +Wed May 20 11:31:39 CEST 2009 - mvyskocil@suse.cz + +- 'fixed bnc#501764: removed clover.license from source tarball' + +------------------------------------------------------------------- +Thu May 7 11:17:29 CEST 2009 - mvyskocil@suse.cz + +- Initial packaging of 8.0 in SUSE (from jpp 5.0) + diff --git a/jtidy.spec b/jtidy.spec new file mode 100644 index 0000000..a846114 --- /dev/null +++ b/jtidy.spec @@ -0,0 +1,115 @@ +# +# spec file for package jtidy +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: jtidy +Version: 1.0.4 +Release: 0 +Summary: HTML syntax checker and pretty printer +License: HTMLTIDY +Group: Development/Libraries/Java +URL: https://github.com/jtidy/jtidy +Source0: https://github.com/jtidy/jtidy/archive/refs/tags/jtidy-1.0.4.tar.gz +Source1: %{name}-build.xml +Source100: %{name}-rpmlintrc +BuildRequires: ant >= 1.6 +BuildRequires: ant-junit +BuildRequires: fdupes +BuildRequires: javapackages-local >= 6 +BuildRequires: xerces-j2 +BuildRequires: xml-apis +Requires: xerces-j2 +Requires: xml-apis +BuildArch: noarch + +%description +JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty +printer. Like its non-Java cousin, JTidy can be used as a tool for +cleaning up malformed and faulty HTML. In addition, JTidy provides a +DOM parser for real-world HTML. + +%package javadoc +Summary: HTML syntax checker and pretty printer +Group: Development/Libraries/Java + +%description javadoc +JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty +printer. Like its non-Java cousin, JTidy can be used as a tool for +cleaning up malformed and faulty HTML. In addition, JTidy provides a +DOM parser for real-world HTML. + +%package scripts +Summary: HTML syntax checker and pretty printer +Group: Development/Libraries/Java +Requires: %{name} = %{version} +Requires: javapackages-tools + +%description scripts +JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty +printer. Like its non-Java cousin, JTidy can be used as a tool for +cleaning up malformed and faulty HTML. In addition, JTidy provides a +DOM parser for real-world HTML. + +%prep +%setup -q -n %{name}-%{name}-%{version} +cp -p %{SOURCE1} build.xml + +%build +mkdir -p lib +build-jar-repository -s lib xerces-j2 xml-apis +%{ant} \ + package javadoc + +%install + +# jar +install -d -m 0755 %{buildroot}%{_javadir} +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a net.sf.jtidy:%{name} + +# javadoc +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -aL target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} + +# shell script +%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-apis +EOF + +%files -f .mfiles +%license LICENSE.txt +%{_javadir}/%{name}.jar +%config(noreplace) %{_sysconfdir}/ant.d/%{name} + +%files javadoc +%defattr(0644,root,root,0755) +%doc %{_javadocdir}/%{name} + +%files scripts +%defattr(0755,root,root,0755) +%{_bindir}/* + +%changelog