Update to 2.1.9
(cherry picked from commit 7e9fe766498cc26c0dd44d1d68c85d04539ec7d6)
This commit is contained in:
parent
6e0c5210d9
commit
f8a812cf1a
@ -1,5 +1,16 @@
|
|||||||
--- build.xml.java1.5 2011-10-24 22:10:29.000000000 +0100
|
From 2717e6430814267badd3ff2d25a4fddfe8c4f075 Mon Sep 17 00:00:00 2001
|
||||||
+++ build.xml 2016-09-15 14:52:27.047032691 +0100
|
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 @@
|
@@ -17,14 +17,14 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@ -66,5 +77,8 @@
|
|||||||
- <javac destdir="${tests_dir}" debug="true" target="1.4" source="1.4">
|
- <javac destdir="${tests_dir}" debug="true" target="1.4" source="1.4">
|
||||||
+ <javac destdir="${tests_dir}" debug="true" target="1.5" source="1.4">
|
+ <javac destdir="${tests_dir}" debug="true" target="1.5" source="1.4">
|
||||||
<src path="${tests_dir}"/>
|
<src path="${tests_dir}"/>
|
||||||
|
<exclude name="org/xbill/DNS/DNSSECWithLunaProviderTest**"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
<project>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>dnsjava</groupId>
|
|
||||||
<artifactId>dnsjava</artifactId>
|
|
||||||
<version>2.1.3</version>
|
|
||||||
</project>
|
|
||||||
Binary file not shown.
20
dnsjava.spec
20
dnsjava.spec
@ -1,14 +1,16 @@
|
|||||||
%global do_not_test 1
|
%global do_not_test 1
|
||||||
Name: dnsjava
|
Name: dnsjava
|
||||||
Version: 2.1.3
|
Version: 2.1.9
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Java DNS implementation
|
Summary: Java DNS implementation
|
||||||
License: BSD and MIT
|
License: BSD and MIT
|
||||||
URL: http://www.dnsjava.org/
|
URL: http://www.dnsjava.org/
|
||||||
Source0: https://sourceforge.net/projects/dnsjava/files/dnsjava/2.1.3/%{name}-%{version}.tar.gz
|
Source0: https://github.com/dnsjava/dnsjava/archive/refs/tags/v%{version}.tar.gz
|
||||||
Source1: %{name}-%{version}.pom
|
|
||||||
Patch0: dnsjava-2.0.6-java1.5.target.patch
|
Patch0: dnsjava-2.0.6-java1.5.target.patch
|
||||||
BuildRequires: ant aqute-bnd javapackages-local ant-junit
|
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
|
BuildArch: noarch
|
||||||
%description
|
%description
|
||||||
dnsjava is an implementation of DNS in Java. It supports all of the common
|
dnsjava is an implementation of DNS in Java. It supports all of the common
|
||||||
@ -38,16 +40,19 @@ Javadoc for %{name}.
|
|||||||
rm -rf doc/
|
rm -rf doc/
|
||||||
find -name "*.class" -print -delete
|
find -name "*.class" -print -delete
|
||||||
find -name "*.jar" -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
|
iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
|
||||||
touch -r Changelog Changelog.tmp
|
touch -r Changelog Changelog.tmp
|
||||||
mv -f Changelog.tmp Changelog
|
mv -f Changelog.tmp Changelog
|
||||||
%mvn_file %{name}:%{name} %{name}
|
%mvn_file %{name}:%{name} %{name}
|
||||||
|
|
||||||
|
%pom_remove_plugin :japicmp-maven-plugin
|
||||||
|
%pom_remove_plugin :maven-gpg-plugin
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CLASSPATH=%(build-classpath jce aqute-bnd)
|
export CLASSPATH=%(build-classpath jce aqute-bnd)
|
||||||
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean bundle docs
|
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean bundle docs
|
||||||
%mvn_artifact %{SOURCE1} org.xbill.dns_%{version}.jar
|
%mvn_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install -J doc
|
%mvn_install -J doc
|
||||||
@ -61,11 +66,14 @@ ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
|
|||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc Changelog README USAGE examples.html *.java
|
%doc Changelog README.md USAGE EXAMPLES.md *.java
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
%files javadoc -f .mfiles-javadoc
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 01 2022 yaoxin <yaoxin30@h-partners.com> - 2.1.9-1
|
||||||
|
- Update to 2.1.9
|
||||||
|
|
||||||
* Sat Aug 15 2020 yanan li <liyanan032@huawei.com> - 2.1.3-1
|
* Sat Aug 15 2020 yanan li <liyanan032@huawei.com> - 2.1.3-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
BIN
v2.1.9.tar.gz
Normal file
BIN
v2.1.9.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user