diff --git a/dnsjava-2.0.6-java1.5.target.patch b/dnsjava-2.0.6-java1.5.target.patch deleted file mode 100644 index 229120a..0000000 --- a/dnsjava-2.0.6-java1.5.target.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 2717e6430814267badd3ff2d25a4fddfe8c4f075 Mon Sep 17 00:00:00 2001 -From: starlet-dx <15929766099@163.com> -Date: Wed, 1 Jun 2022 11:13:47 +0800 -Subject: [PATCH 1/1] dnsjava 2.0.6 java1.5.target - ---- - build.xml | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/build.xml b/build.xml -index 098c044..e8a30a2 100644 ---- a/build.xml -+++ b/build.xml -@@ -17,14 +17,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -35,6 +35,7 @@ - basedir="${build_dir}" includes="**/*.class **/*.properties"> - - -+ - - - -@@ -46,21 +47,18 @@ - - - -- -- -+ - - Bundle-Version: ${version} - Bundle-Name: dnsjava is an implementation of DNS in Java - Bundle-SymbolicName: org.xbill.dns - Export-Package: org.xbill.DNS;version=${version},org.xbill.DNS.spi;version=${version},org.xbill.DNS.utils;version=${version},org.xbill.DNS.windows;version=${version} - Bundle-Vendor: dnsjava.org -- Bundle-RequiredExecutionEnvironment: J2SE-1.4 -+ Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Import-Package: !org.xbill.DNS*,!sun.*,* - - - -@@ -77,7 +75,7 @@ - -+ windowtitle="dnsjava documentation" additionalparam="-Xdoclint:none"> - - - -@@ -107,7 +105,7 @@ - - - -- -+ - - - --- -2.30.0 - diff --git a/dnsjava.spec b/dnsjava.spec index 850fbf4..2fd2473 100644 --- a/dnsjava.spec +++ b/dnsjava.spec @@ -1,16 +1,19 @@ %global do_not_test 1 Name: dnsjava -Version: 2.1.9 +Version: 3.5.2 Release: 1 Summary: Java DNS implementation License: BSD and MIT URL: http://www.dnsjava.org/ Source0: https://github.com/dnsjava/dnsjava/archive/refs/tags/v%{version}.tar.gz -Patch0: dnsjava-2.0.6-java1.5.target.patch -BuildRequires: ant aqute-bnd javapackages-local ant-junit +BuildRequires: aqute-bnd javapackages-local BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.jacoco:jacoco-maven-plugin) +BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) +BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) +BuildRequires: mvn(org.apache.maven.wagon:wagon-http) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) + BuildArch: noarch %description dnsjava is an implementation of DNS in Java. It supports all of the common @@ -40,7 +43,6 @@ Javadoc for %{name}. rm -rf doc/ find -name "*.class" -print -delete find -name "*.jar" -print -delete -%patch0 -p1 -b .java1.5 iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp touch -r Changelog Changelog.tmp mv -f Changelog.tmp Changelog @@ -48,30 +50,30 @@ mv -f Changelog.tmp Changelog %pom_remove_plugin :japicmp-maven-plugin %pom_remove_plugin :maven-gpg-plugin +%pom_remove_plugin :jacoco-maven-plugin %build export CLASSPATH=%(build-classpath jce aqute-bnd) -ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean bundle docs -%mvn_build +%mvn_build -b -f --xmvn-javadoc %install +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %mvn_install -J doc -%if ! 0%{?do_not_test} - -%check export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar' -ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests -ant -Dj2se.javadoc=%{_javadocdir}/java run_tests -%endif +cp -rf target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles %license LICENSE -%doc Changelog README.md USAGE EXAMPLES.md *.java +%doc Changelog README.adoc USAGE.md EXAMPLES.md -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name}/* %license LICENSE %changelog +* Fri Aug 11 2023 Ge Wang - 3.5.2-1 +- Update to 3.5.2 + * Wed Jun 01 2022 yaoxin - 2.1.9-1 - Update to 2.1.9 diff --git a/v2.1.9.tar.gz b/v2.1.9.tar.gz deleted file mode 100644 index 8bc7c4a..0000000 Binary files a/v2.1.9.tar.gz and /dev/null differ diff --git a/v3.5.2.tar.gz b/v3.5.2.tar.gz new file mode 100644 index 0000000..6e29544 Binary files /dev/null and b/v3.5.2.tar.gz differ