[packages/java-gnu-inetlib] - revert some changes in upstream version 1.1.2 that breaks other packages - fix javadoc - rel 2
baggins
baggins at pld-linux.org
Sun Mar 5 14:51:51 CET 2017
commit a10a5c1b691c91aa9296e827e4bb9ac3bacd53cb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Mar 5 14:51:28 2017 +0100
- revert some changes in upstream version 1.1.2 that breaks other packages
- fix javadoc
- rel 2
0001-make-logger-static-again.patch | 65 +++++++++++++++++++++++
java-gnu-inetlib.spec | 10 ++--
javadoc.patch | 100 ++++++++++++++++++++++++++++++++++++
3 files changed, 172 insertions(+), 3 deletions(-)
---
diff --git a/java-gnu-inetlib.spec b/java-gnu-inetlib.spec
index 91d17d5..71870bf 100644
--- a/java-gnu-inetlib.spec
+++ b/java-gnu-inetlib.spec
@@ -2,11 +2,13 @@ Summary: GNU inetlib - library of clients for common Internet protocols
Summary(pl.UTF-8): GNU inetlib - biblioteka klientów popularnych protokołów internetowych
Name: java-gnu-inetlib
Version: 1.1.2
-Release: 1
+Release: 2
License: GPL v2+
Group: Libraries/Java
Source0: http://ftp.gnu.org/gnu/classpath/inetlib-%{version}.tar.gz
# Source0-md5: e28147996e70b63b6caa743319a4bf46
+Patch0: 0001-make-logger-static-again.patch
+Patch1: javadoc.patch
URL: http://www.gnu.org/software/classpath/inetlib.html
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -78,6 +80,8 @@ Dokumentacja API GNU inetlib.
%prep
%setup -q -n inetlib-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%{__aclocal}
@@ -89,8 +93,8 @@ export JAVAC=%{_bindir}/javac
export JAVA=%{_bindir}/java
%configure
-%{__make}
-%{__make} javadoc
+%{__make} -j1
+%{__make} -j1 javadoc
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/0001-make-logger-static-again.patch b/0001-make-logger-static-again.patch
new file mode 100644
index 0000000..f37a74f
--- /dev/null
+++ b/0001-make-logger-static-again.patch
@@ -0,0 +1,65 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 25 Sep 2011 18:36:30 +0200
+Subject: make logger static again
+
+Revert some changes in upstream version 1.1.2 that breaks other packages.
+---
+ source/gnu/inet/imap/IMAPConnection.java | 2 +-
+ source/gnu/inet/nntp/NNTPConnection.java | 2 +-
+ source/gnu/inet/pop3/POP3Connection.java | 2 +-
+ source/gnu/inet/smtp/SMTPConnection.java | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source/gnu/inet/imap/IMAPConnection.java b/source/gnu/inet/imap/IMAPConnection.java
+index 039644a..42745db 100644
+--- a/source/gnu/inet/imap/IMAPConnection.java
++++ b/source/gnu/inet/imap/IMAPConnection.java
+@@ -120,7 +120,7 @@ public class IMAPConnection
+ /**
+ * The logger used for IMAP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.imap");
++ public static final Logger logger = Logger.getLogger("gnu.inet.imap");
+
+ /**
+ * The socket used for communication with the server.
+diff --git a/source/gnu/inet/nntp/NNTPConnection.java b/source/gnu/inet/nntp/NNTPConnection.java
+index 26898d6..172a5cf 100644
+--- a/source/gnu/inet/nntp/NNTPConnection.java
++++ b/source/gnu/inet/nntp/NNTPConnection.java
+@@ -105,7 +105,7 @@ public class NNTPConnection
+ /**
+ * The logger used for NNTP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.nntp");
++ public static final Logger logger = Logger.getLogger("gnu.inet.nntp");
+
+ /**
+ * The hostname of the host we are connected to.
+diff --git a/source/gnu/inet/pop3/POP3Connection.java b/source/gnu/inet/pop3/POP3Connection.java
+index 3bdaa48..859083c 100644
+--- a/source/gnu/inet/pop3/POP3Connection.java
++++ b/source/gnu/inet/pop3/POP3Connection.java
+@@ -136,7 +136,7 @@ public class POP3Connection
+ /**
+ * The logger used for POP3 protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.pop3");
++ public static final Logger logger = Logger.getLogger("gnu.inet.pop3");
+
+ /**
+ * The socket used to communicate with the server.
+diff --git a/source/gnu/inet/smtp/SMTPConnection.java b/source/gnu/inet/smtp/SMTPConnection.java
+index c625f28..f97262d 100644
+--- a/source/gnu/inet/smtp/SMTPConnection.java
++++ b/source/gnu/inet/smtp/SMTPConnection.java
+@@ -124,7 +124,7 @@ public class SMTPConnection
+ /**
+ * The logger used for SMTP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.smtp");
++ public static final Logger logger = Logger.getLogger("gnu.inet.smtp");
+
+ /**
+ * The underlying socket used for communicating with the server.
+--
diff --git a/javadoc.patch b/javadoc.patch
new file mode 100644
index 0000000..7327b62
--- /dev/null
+++ b/javadoc.patch
@@ -0,0 +1,100 @@
+diff -ur inetlib-1.1.2/source/gnu/inet/gopher/GopherConnection.java inetlib-1.1.2.javadoc/source/gnu/inet/gopher/GopherConnection.java
+--- inetlib-1.1.2/source/gnu/inet/gopher/GopherConnection.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/gopher/GopherConnection.java 2017-03-05 14:46:03.045469924 +0100
+@@ -66,7 +66,7 @@
+ /**
+ * Creates a new connection to the gopher server at the specified
+ * hostname.
+- * @param hostname the hostname
++ * @param host the hostname
+ */
+ public GopherConnection(String host)
+ throws IOException
+@@ -77,7 +77,7 @@
+ /**
+ * Creates a new connection to the gopher server at the specified
+ * hostname with the specified non-standard port.
+- * @param hostname the hostname
++ * @param host the hostname
+ * @param port the non-standard port to use
+ */
+ public GopherConnection(String host, int port)
+diff -ur inetlib-1.1.2/source/gnu/inet/http/HTTPConnection.java inetlib-1.1.2.javadoc/source/gnu/inet/http/HTTPConnection.java
+--- inetlib-1.1.2/source/gnu/inet/http/HTTPConnection.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/http/HTTPConnection.java 2017-03-05 14:49:10.984484690 +0100
+@@ -277,7 +277,6 @@
+
+ /**
+ * Returns the HTTP version string supported by this connection.
+- * @see #version
+ */
+ public String getVersion()
+ {
+diff -ur inetlib-1.1.2/source/gnu/inet/http/ResponseHeaderHandler.java inetlib-1.1.2.javadoc/source/gnu/inet/http/ResponseHeaderHandler.java
+--- inetlib-1.1.2/source/gnu/inet/http/ResponseHeaderHandler.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/http/ResponseHeaderHandler.java 2017-03-05 14:49:29.671384878 +0100
+@@ -41,7 +41,6 @@
+ /**
+ * Callback interface for objects that wish to be notified of response
+ * header values.
+- * @see Request#setHeaderHandler(String)
+ *
+ * @author <a href='mailto:dog at gnu.org'>Chris Burdess</a>
+ */
+diff -ur inetlib-1.1.2/source/gnu/inet/imap/IMAPConnection.java inetlib-1.1.2.javadoc/source/gnu/inet/imap/IMAPConnection.java
+--- inetlib-1.1.2/source/gnu/inet/imap/IMAPConnection.java 2017-03-05 14:49:49.981638694 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/imap/IMAPConnection.java 2017-03-05 14:44:24.514239315 +0100
+@@ -350,6 +350,7 @@
+ * <li>A tagged response corresponding to a pending command</li>
+ * <li>An untagged error response</li>
+ * <li>A continuation response</li>
++ * </ul>
+ */
+ protected IMAPResponse readResponse()
+ throws IOException
+diff -ur inetlib-1.1.2/source/gnu/inet/ldap/BEREncoder.java inetlib-1.1.2.javadoc/source/gnu/inet/ldap/BEREncoder.java
+--- inetlib-1.1.2/source/gnu/inet/ldap/BEREncoder.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/ldap/BEREncoder.java 2017-03-05 14:45:34.711782682 +0100
+@@ -56,7 +56,7 @@
+
+ /**
+ * Constructor.
+- * @param utf whether to use UTF-8 for encoding strings
++ * @param utf8 whether to use UTF-8 for encoding strings
+ */
+ public BEREncoder(boolean utf8)
+ {
+@@ -65,7 +65,7 @@
+
+ /**
+ * Constructor.
+- * @param utf whether to use UTF-8 for encoding strings
++ * @param utf8 whether to use UTF-8 for encoding strings
+ * @param initialSize the initial buffer size
+ */
+ public BEREncoder(boolean utf8, int initialSize)
+diff -ur inetlib-1.1.2/source/gnu/inet/ldap/ResultHandler.java inetlib-1.1.2.javadoc/source/gnu/inet/ldap/ResultHandler.java
+--- inetlib-1.1.2/source/gnu/inet/ldap/ResultHandler.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/ldap/ResultHandler.java 2017-03-05 14:45:04.911410481 +0100
+@@ -65,7 +65,7 @@
+ * <li>java.lang.Double</li>
+ * <li>java.lang.Boolean</li>
+ * <li>byte[]</li>
+- * <ul>
++ * </ul>
+ * @param name the object name DN
+ * @param attributes a map of attribute names to values
+ */
+diff -ur inetlib-1.1.2/source/gnu/inet/nntp/NNTPConstants.java inetlib-1.1.2.javadoc/source/gnu/inet/nntp/NNTPConstants.java
+--- inetlib-1.1.2/source/gnu/inet/nntp/NNTPConstants.java 2010-03-08 19:01:26.000000000 +0100
++++ inetlib-1.1.2.javadoc/source/gnu/inet/nntp/NNTPConstants.java 2017-03-05 14:48:15.253788296 +0100
+@@ -98,8 +98,7 @@
+ * (<tt>g</tt> = newsgroup name,
+ * <tt>l</tt> = last article number in group,
+ * <tt>f</tt> = first article number in group,
+- * <tt>p</tt> = 'y' if posting to the group is allowed,
+- * 'n' otherwise)
++ * <tt>p</tt> = if posting to the group is allowed.)
+ */
+ public static final short LIST_FOLLOWS = 215;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-gnu-inetlib.git/commitdiff/a10a5c1b691c91aa9296e827e4bb9ac3bacd53cb
More information about the pld-cvs-commit
mailing list