diff --git a/dnsjava-2.0.6-java1.5.target.patch b/dnsjava-2.0.6-java1.5.target.patch index 7b803e9d4b650dc1ea6dafaf44cb4c27fe5429aa..229120ac047837be6196e10a171d085a05c5dc62 100644 --- a/dnsjava-2.0.6-java1.5.target.patch +++ b/dnsjava-2.0.6-java1.5.target.patch @@ -1,5 +1,16 @@ ---- build.xml.java1.5 2011-10-24 22:10:29.000000000 +0100 -+++ build.xml 2016-09-15 14:52:27.047032691 +0100 +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 @@ @@ -66,5 +77,8 @@ - + + - +-- +2.30.0 + diff --git a/dnsjava-2.1.3.pom b/dnsjava-2.1.3.pom deleted file mode 100644 index 46be5b1515931d4f4f8cb0c12c57e93566d95fd9..0000000000000000000000000000000000000000 --- a/dnsjava-2.1.3.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - dnsjava - dnsjava - 2.1.3 - diff --git a/dnsjava-2.1.3.tar.gz b/dnsjava-2.1.3.tar.gz deleted file mode 100644 index 4355ef018712695e8138d4708bfc9946dc80bb7c..0000000000000000000000000000000000000000 Binary files a/dnsjava-2.1.3.tar.gz and /dev/null differ diff --git a/dnsjava.spec b/dnsjava.spec index c378f07e183efb6d1429db9653bd4f54e4f9ab48..850fbf4d5bc06362cfe197fdf6b66ecb0a65b662 100644 --- a/dnsjava.spec +++ b/dnsjava.spec @@ -1,14 +1,16 @@ %global do_not_test 1 Name: dnsjava -Version: 2.1.3 +Version: 2.1.9 Release: 1 Summary: Java DNS implementation License: BSD and MIT URL: http://www.dnsjava.org/ -Source0: https://sourceforge.net/projects/dnsjava/files/dnsjava/2.1.3/%{name}-%{version}.tar.gz -Source1: %{name}-%{version}.pom +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: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.jacoco:jacoco-maven-plugin) BuildArch: noarch %description dnsjava is an implementation of DNS in Java. It supports all of the common @@ -38,16 +40,19 @@ Javadoc for %{name}. rm -rf doc/ find -name "*.class" -print -delete find -name "*.jar" -print -delete -%patch0 -p0 -b .java1.5 +%patch0 -p1 -b .java1.5 iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp touch -r Changelog Changelog.tmp mv -f Changelog.tmp Changelog %mvn_file %{name}:%{name} %{name} +%pom_remove_plugin :japicmp-maven-plugin +%pom_remove_plugin :maven-gpg-plugin + %build export CLASSPATH=%(build-classpath jce aqute-bnd) ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean bundle docs -%mvn_artifact %{SOURCE1} org.xbill.dns_%{version}.jar +%mvn_build %install %mvn_install -J doc @@ -61,11 +66,14 @@ ant -Dj2se.javadoc=%{_javadocdir}/java run_tests %files -f .mfiles %license LICENSE -%doc Changelog README USAGE examples.html *.java +%doc Changelog README.md USAGE EXAMPLES.md *.java %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Wed Jun 01 2022 yaoxin - 2.1.9-1 +- Update to 2.1.9 + * Sat Aug 15 2020 yanan li - 2.1.3-1 - Package init diff --git a/v2.1.9.tar.gz b/v2.1.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8bc7c4a5560a683d005c2dbf57010564057605ab Binary files /dev/null and b/v2.1.9.tar.gz differ