Notification time stamped 2020-09-30 22:25:15 UTC
From b50f793c6db68c123fe37f39f7c8887386801116 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Sep 30 2020 22:24:41 +0000
Subject: Bring back to Fedora. Switch to github repo.
---
diff --git a/.gitignore b/.gitignore
index 32fde12..43b0798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/naga-82svn.tar.bz2
+/naga-*.tar.gz
diff --git a/naga-encoding.patch b/naga-encoding.patch
deleted file mode 100644
index d328bb3..0000000
--- a/naga-encoding.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up naga/build.xml.orig naga/build.xml
---- naga/build.xml.orig 2013-03-25 17:50:02.000000000 +0200
-+++ naga/build.xml 2013-03-25 17:57:33.205315047 +0200
-@@ -33,6 +33,7 @@
- author="true"
- version="true"
- use="true"
-+ encoding="UTF8"
- windowtitle="Naga API">
- <doctitle><![CDATA[<h1>Naga</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To
do:"/>
diff --git a/naga-java18.patch b/naga-java18.patch
new file mode 100644
index 0000000..cfc3c38
--- /dev/null
+++ b/naga-java18.patch
@@ -0,0 +1,22 @@
+--- a/build.xml 2020-09-30 16:15:07.209281051 -0600
++++ b/build.xml 2020-09-30 16:17:31.737194495 -0600
+@@ -23,7 +23,9 @@
+ <antcall target="clear_compile_dir"/>
+ <javac srcdir="${main.dir}"
+ destdir="${build.classes.dir}"
+- source="1.5"
++ source="1.8"
++ target="1.8"
++ encoding="UTF8"
+ optimize="on"/>
+ </target>
+
+@@ -41,7 +43,7 @@
+
+ <target name="compile_debug" depends="init"
description="Compile the sources with debug info">
+ <antcall target="clear_compile_dir"/>
+- <javac srcdir="${main.dir}" destdir="${build.classes.dir}"
source="1.5"
++ <javac srcdir="${main.dir}" destdir="${build.classes.dir}"
source="1.8" target="1.8" encoding="UTF8"
+ debug="yes" debuglevel="lines,source"
optimize="on"/>
+ </target>
+
diff --git a/naga-javadoc.patch b/naga-javadoc.patch
new file mode 100644
index 0000000..81388d6
--- /dev/null
+++ b/naga-javadoc.patch
@@ -0,0 +1,520 @@
+--- a/build.xml 2020-09-30 03:56:57.000000000 -0600
++++ b/build.xml 2020-09-30 16:15:07.209281051 -0600
+@@ -33,9 +33,9 @@
+ author="true"
+ version="true"
+ use="true"
++ encoding="UTF8"
+ windowtitle="Naga API">
+ <doctitle><![CDATA[<h1>Naga</h1>]]></doctitle>
+- <tag name="todo" scope="all" description="To
do:"/>
+ </javadoc>
+ </target>
+
+--- a/src/main/naga/eventmachine/EventMachine.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/eventmachine/EventMachine.java 2020-09-30 16:15:07.211281049 -0600
+@@ -35,6 +35,7 @@ import java.util.concurrent.PriorityBloc
+ * together with the a Naga NIOService.
+ * <p>
+ * Creating and starting an event machine:
++ * </p>
+ * <pre>
+ * EventMachine em = new EventMachine();
+ * // Start our event machine thread:
+@@ -94,8 +95,7 @@ public class EventMachine
+
+ /**
+ * Execute a runnable on the Event/NIO thread.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param runnable the runnable to execute on the server thread as soon as possible,
+ */
+@@ -109,8 +109,8 @@ public class EventMachine
+ * <p>
+ * This is the primary way to execute delayed events, typically time-outs and similar
+ * behaviour.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param runnable the runnable to execute after the given delay.
+ * @param msDelay the delay until executing this runnable.
+@@ -138,10 +138,8 @@ public class EventMachine
+ }
+ /**
+ * Execute a runnable on the Event/NIO thread after at a certain time.
+- * <p/>
+- * This is the primary way to execute scheduled events.
+- * <p/>
+- * <em>This method is thread-safe.</em>
++ * <p>This is the primary way to execute scheduled events.</p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param runnable the runnable to execute at the given time.
+ * @param date the time date when this runnable should execute.
+@@ -158,8 +156,8 @@ public class EventMachine
+ * <p>
+ * The observer will receive all exceptions thrown by the underlying NIOService
+ * and by queued events.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param observer the observer to use, null will cause exceptions to log to stderr
+ */
+@@ -183,9 +181,10 @@ public class EventMachine
+ /**
+ * Causes the event machine to start running on a separate thread together with the
+ * NIOService.
+- * <p/>
++ * <p>
+ * Note that the NIOService should not be called (using {@link
naga.NIOService#selectNonBlocking()} and related
+ * functions) on another thread if the EventMachine is used.
++ * </p>
+ */
+ public synchronized void start()
+ {
+--- a/src/main/naga/examples/package-info.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/examples/package-info.java 2020-09-30 16:15:07.211281049 -0600
+@@ -1,6 +1,7 @@
+ /**
+ * Various examples on how to use Naga.
+- * <p/>
++ * <p>
+ * <em>These classes are only available in the debug version of the naga
deliverable.</em>
++ * </p>
+ */
+ package naga.examples;
+\ No newline at end of file
+--- a/src/main/naga/examples/Rot13Server.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/examples/Rot13Server.java 2020-09-30 16:15:07.212281049 -0600
+@@ -30,8 +30,9 @@ import java.io.IOException;
+ /**
+ * Creates a Rot13Server that takes a line of text and returns the Rot13 version of the
+ * text.
+- * <p/>
++ * <p>
+ * Run using {@code java naga.examples.Rot13Server [port]}.
++ * </p>
+ *
+ * @author Christoffer Lerno
+ */
+--- a/src/main/naga/NIOService.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/NIOService.java 2020-09-30 16:15:07.213281048 -0600
+@@ -38,31 +38,36 @@ import java.util.concurrent.ConcurrentLi
+ * <p>
+ * Common usage is to create a single instance of this service and
+ * then run one other the select methods in a loop.
++ * </p>
+ * <p>
+ * Use {@link naga.NIOService#openSocket(String, int)} to open a socket to a remote
server,
+ * and {@link naga.NIOService#openServerSocket(int)} to open a server socket locally.
++ * </p>
+ * <p>
+ * Note that the NIOServerSocket by default opens in a "refuse connections"
state. To
+ * start accepting players, the socket's acceptor must first be set to accept
connections.
+ * See documentation for openServerSocket for more details.
++ * </p>
+ * <p>
+ * Example use:
++ * </p>
+ * <p>
+ * Using the server socket:
+- * <code><pre>
++ * </p>
++ * <pre>
+ * NIOService service = new NIOService;
+ * NIOServerSocket serverSocket = service.openServerSocket(1234);
+ * serverSocket.setConnectionAcceptor(myAcceptor);
+ * serverSocket.listen(myObserver);
+- * </pre></code>
++ * </pre>
+ * Using regular sockets:
+- * <code><pre>
++ * <pre>
+ * NIOService service = new NIOService;
+ * NIOSocket socket = service.openSocket("www.google.com", 1234);
+ * socket.listen(myObserver);
+ * // Asynchronous write by default:
+ * socket.write("Some message".getBytes());
+- * </pre></code>
++ * </pre>
+ *
+ * @author Christoffer Lerno
+ */
+@@ -165,8 +170,8 @@ public class NIOService
+ * a NIOSocket.
+ * <p>
+ * This roughly corresponds to creating a regular socket using new Socket(host, port).
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param host the host we want to connect to.
+ * @param port the port to use for the connection.
+@@ -183,8 +188,8 @@ public class NIOService
+ * a NIOSocketSSL.
+ * <p>
+ * This roughly corresponds to creating a regular socket using new SSLSocket(host,
port).
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param sslEngine the SSL engine to use for SSL-negotiation.
+ * @param host the host we want to connect to.
+@@ -202,8 +207,8 @@ public class NIOService
+ * a NIOSocket.
+ * <p>
+ * This roughly corresponds to creating a regular socket using new Socket(inetAddress,
port).
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param inetAddress the address we want to connect to.
+ * @param port the port to use for the connection.
+@@ -224,8 +229,8 @@ public class NIOService
+ * a NIOSocketSSL.
+ * <p>
+ * This roughly corresponds to creating a regular socket using new
SSLSocket(inetAddress, port).
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param sslEngine the SSL engine to use for SSL-negotiation.
+ * @param inetAddress the address we want to connect to.
+@@ -248,8 +253,8 @@ public class NIOService
+ * Open a server socket on the given port.
+ * <p>
+ * This roughly corresponds to using new ServerSocket(port, backlog);
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param port the port to open.
+ * @param backlog the maximum connection backlog (i.e. connections pending accept)
+@@ -265,8 +270,8 @@ public class NIOService
+ * Open an SSL server socket on the given port.
+ * <p>
+ * This roughly corresponds to using new SSLServerSocket(port, backlog);
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param sslContext the SSLContext to use for SSL-negotiation.
+ * @param port the port to open.
+@@ -283,8 +288,8 @@ public class NIOService
+ * Open a server socket on the given port with the default connection backlog.
+ * <p>
+ * This roughly corresponds to using new ServerSocket(port);
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param port the port to open.
+ * @return a NIOServerSocket for asynchronous connection to the server socket.
+@@ -299,8 +304,8 @@ public class NIOService
+ * Open an SSL server socket on the given port with the default connection backlog.
+ * <p>
+ * This roughly corresponds to using new SSLServerSocket(port);
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param sslContext the SSLContext to use for SSL-negotiation.
+ * @param port the port to open.
+@@ -314,8 +319,7 @@ public class NIOService
+
+ /**
+ * Open an SSL server socket on the address.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param sslContext the SSLContext to use for SSL-negotiation.
+ * @param address the address to open.
+@@ -337,8 +341,7 @@ public class NIOService
+
+ /**
+ * Open a server socket on the address.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param address the address to open.
+ * @param backlog the maximum connection backlog (i.e. connections pending accept)
+@@ -359,8 +362,7 @@ public class NIOService
+ /**
+ * Internal method to mark a socket channel for pending registration
+ * and create a NIOSocket wrapper around it.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @param socketChannel the socket channel to wrap.
+ * @param address the address for this socket.
+@@ -379,6 +381,7 @@ public class NIOService
+ * Internal method to execute events on the internal event queue.
+ * <p>
+ * This method should only ever be called from the NIOService thread.
++ * </p>
+ */
+ private void executeQueue()
+ {
+@@ -400,8 +403,8 @@ public class NIOService
+ * Internal method to handle the key set generated by the internal Selector.
+ * <p>
+ * Will simply remove each entry and handle the key.
+- * <p>
+- * Called on the NIOService thread.
++ * </p>
++ * <p>Called on the NIOService thread.</p>
+ */
+ private void handleSelectedKeys()
+ {
+@@ -428,8 +431,7 @@ public class NIOService
+
+ /**
+ * Set the new shared buffer size.
+- * <p>
+- * <em>This method is *not* thread-safe.</em>
++ * <p><em>This method is *not* thread-safe.</em></p>
+ * @param newBufferSize the new buffer size.
+ * @throws IllegalArgumentException if the new size is less than 256 bytes.
+ */
+@@ -441,8 +443,7 @@ public class NIOService
+
+ /**
+ * Returns the new shared buffer size.
+- * <p/>
+- * <em>This method is *not* thread-safe.</em>
++ * <p><em>This method is *not* thread-safe.</em></p>
+ *
+ * @return the current buffer size, which is the largest packet that can be read.
+ */
+@@ -467,8 +468,8 @@ public class NIOService
+ * Internal method to handle a SelectionKey that has changed.
+ * <p>
+ * Will delegate actual actions to the associated ChannelResponder.
+- * <p>
+- * Called on the NIOService thread.
++ * </p>
++ * <p>Called on the NIOService thread.</p>
+ * @param key the key to handle.
+ */
+ private void handleKey(SelectionKey key)
+@@ -504,10 +505,9 @@ public class NIOService
+ * Close the entire service.
+ * <p>
+ * This will disconnect all sockets associated with this service.
+- * <p>
+- * It is not possible to restart the service once closed.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * </p>
++ * <p>It is not possible to restart the service once closed.</p>
++ * <p><em>This method is thread-safe.</em></p>
+ */
+ public void close()
+ {
+@@ -518,8 +518,7 @@ public class NIOService
+
+ /**
+ * Determine if this service is open.
+- * <p>
+- * <em>This method is thread-safe.</em>
++ * <p><em>This method is thread-safe.</em></p>
+ *
+ * @return true if the service is open, false otherwise.
+ */
+@@ -533,6 +532,7 @@ public class NIOService
+ * <p>
+ * This method is thread-safe, but should in general not be used by
+ * other applications.
++ * </p>
+ *
+ * @param event the event to run on the NIOService-thread.
+ */
+@@ -578,8 +578,7 @@ public class NIOService
+
+ /**
+ * Logs an exception using the exception observer. This is mainly for use by the
Naga classes.
+- * <p>
+- * Should only be used on the NIOService thread.
++ * <p>Should only be used on the NIOService thread.</p>
+ *
+ * @param t the exception thrown.
+ */
+--- a/src/main/naga/NIOSocketSSL.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/NIOSocketSSL.java 2020-09-30 16:15:07.213281048 -0600
+@@ -40,6 +40,7 @@ public interface NIOSocketSSL extends NI
+
+ /**
+ * Initiates SSL-handshake, starts encrypted communication.
++ * @throws SSLException if the handshake fails
+ */
+ void beginHandshake() throws SSLException;
+
+--- a/src/main/naga/NIOUtils.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/NIOUtils.java 2020-09-30 16:15:07.214281048 -0600
+@@ -54,7 +54,7 @@ public class NIOUtils
+ *
+ * @param byteBuffer the ByteBuffer to use.
+ * @param headerSize the header size in bytes. 1-4.
+- * @param valueToEncode the value to encode, 0 <= value < 2^(headerSize * 8)
++ * @param valueToEncode the value to encode, 0 ≤ value < 2^(headerSize
* 8)
+ * @param bigEndian if the encoding is big endian or not.
+ * @throws IllegalArgumentException if the value is out of range for the given
header size.
+ */
+@@ -81,7 +81,7 @@ public class NIOUtils
+ *
+ * @param buffer the byte array to set the header for
+ * @param headerSize the header size in bytes. 1-4.
+- * @param valueToEncode the value to encode, 0 <= value < 2^(headerSize * 8)
++ * @param valueToEncode the value to encode, 0 ≤ value < 2^(headerSize *
8)
+ * @param bigEndian if the encoding is big endian or not.
+ * @throws IllegalArgumentException if the value is out of range for the given header
size.
+ */
+@@ -107,6 +107,7 @@ public class NIOUtils
+ * encoding.
+ * <p>
+ * <em>Note that trying to decode a value larger than 2^31 - 2 is not
supported.</em>
++ * </p>
+ *
+ * @param header the header to encode from.
+ * @param size the header size, 1-4.
+@@ -142,6 +143,7 @@ public class NIOUtils
+ * encoding.
+ * <p>
+ * <em>Note that trying to decode a value larger than 2^31 - 2 is not
supported.</em>
++ * </p>
+ *
+ * @param data the data to encode from.
+ * @param length the length of the header.
+--- a/src/main/naga/package-info.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/package-info.java 2020-09-30 16:15:07.214281048 -0600
+@@ -1,9 +1,10 @@
+ /**
+ * The main Naga classes.
+- * <p/>
++ * <p>
+ * See {@link naga.NIOService} on how to start a new NIOService for asynchronous
+ * socket I/O.
+- * <p/>
++ * </p>
++ * <p>
+ * The library uses the implementations of {@link naga.NIOSocket} and {@link
naga.NIOServerSocket}
+ * as asynchronous counterparts to {@link java.net.Socket} and {@link
java.net.ServerSocket}.
+ * </p>
+--- a/src/main/naga/packetreader/DelimiterPacketReader.java 2020-09-30 03:56:57.000000000
-0600
++++ b/src/main/naga/packetreader/DelimiterPacketReader.java 2020-09-30 16:15:07.215281047
-0600
+@@ -32,8 +32,8 @@ import java.nio.ByteBuffer;
+ * Since packets read with delimiters may potentially grow unbounded, you can also
supply
+ * a maximum buffer size to prevent an attacker from causing an out of memory
+ * by continously sending data without the delimiter.
+- * <p>
+- * The delimiter will never appear in the packet itself.
++ * </p>
++ * <p>The delimiter will never appear in the packet itself.</p>
+ *
+ * @author Christoffer Lerno
+ */
+@@ -59,7 +59,7 @@ public class DelimiterPacketReader imple
+ * @param delimiter the byte value of the delimiter.
+ * @param maxPacketSize the maximum number of bytes read before throwing an
+ * IOException. -1 means the packet has no size limit.
+- * @throws IllegalArgumentException if maxPacketSize < 1
++ * @throws IllegalArgumentException if maxPacketSize < 1
+ */
+ public DelimiterPacketReader(byte delimiter, int maxPacketSize)
+ {
+@@ -86,6 +86,7 @@ public class DelimiterPacketReader imple
+ * <p>
+ * This method is thread-safe, but will not
+ * affect reads in progress.
++ * </p>
+ *
+ * @param maxPacketSize the new maximum packet size.
+ */
+--- a/src/main/naga/PacketReader.java 2020-09-30 03:56:57.000000000 -0600
++++ b/src/main/naga/PacketReader.java 2020-09-30 16:15:07.215281047 -0600
+@@ -29,6 +29,7 @@ import java.nio.ByteBuffer;
+ * Interface for packet reader plugins to assist a socket in reading.
+ * <p>
+ * PacketReaders are in general intended to help splitting
++ * </p>
+ *
+ * @author Christoffer Lerno
+ */
+@@ -40,8 +41,9 @@ public interface PacketReader
+
+ /**
+ * Create a new packet using the ByteBuffer given.
+- * <p/>
++ * <p>
+ * If there isn't sufficient data to construct a packet, return null.
++ * </p>
+ *
+ * @param byteBuffer the byte buffer to use.
+ * @return the new packet created, or null if no packet could be created. The method
will continously
+--- a/src/main/naga/packetreader/RegularPacketReader.java 2020-09-30 03:56:57.000000000
-0600
++++ b/src/main/naga/packetreader/RegularPacketReader.java 2020-09-30 16:15:07.216281047
-0600
+@@ -29,14 +29,13 @@ import java.nio.ByteBuffer;
+
+ /**
+ * Reads packet of the format
+- * <p>
+- * <code>
+- * [header 1-4 bytes] => content size
+- * <br>
+- * [content] => 0-255/0-65535/0-16777215/0-2147483646
+- * </code>
++ * <pre>
++ * [header 1-4 bytes] → content size
++ * [content] → 0-255/0-65535/0-16777215/0-2147483646
++ * </pre>
+ * <p>
+ * Note that the maximum size for 4 bytes is a signed 32 bit int, not unsigned.
++ * </p>
+ *
+ * @author Christoffer Lerno
+ */
+--- a/src/main/naga/packetwriter/RegularPacketWriter.java 2020-09-30 03:56:57.000000000
-0600
++++ b/src/main/naga/packetwriter/RegularPacketWriter.java 2020-09-30 16:15:07.216281047
-0600
+@@ -28,19 +28,19 @@ import java.nio.ByteBuffer;
+
+ /**
+ * Writes packet of the format
+- * <p>
+- * <code>
+- * [header 1-4 bytes] => content size
+- * <br>
+- * [content] => 0-255/0-65535/0-16777215/0-2147483646
+- * </code>
++ * <pre>
++ * [header 1-4 bytes] → content size
++ * [content] → 0-255/0-65535/0-16777215/0-2147483646
++ * </pre>
+ * <p>
+ * Note that the maximum size for 4 bytes is a signed 32 bit int, not unsigned.
++ * </p>
+ * <p>
+ * The packet writer will not validate outgoing packets, so make sure that
+ * the packet content size will fit in the header. I.e. make sure that if you have
+ * a 1 byte header, you do not send packets larger than 255 bytes, if two bytes, larger
than 65535 and
+ * so on.
++ * </p>
+ *
+ * @author Christoffer Lerno
+ */
diff --git a/naga.spec b/naga.spec
index 928cb81..416d590 100644
--- a/naga.spec
+++ b/naga.spec
@@ -1,28 +1,34 @@
-%global svnrel 82
+# Upstream was originally located at
http://code.google.com/p/naga/. The
+# primary author later created a github repo and added some documentation, but
+# never tagged any releases. We take his latest github commit.
Name: naga
Version: 3.0
-Release: 14.%{svnrel}svn%{?dist}
+
+%global commit 6f1e95ddfdb1aa7719c98168f0a5efc5be191426
+%global date 20200930
+%global forgeurl
https://github.com/lerno/naga
+
+%forgemeta
+
+URL: %{forgeurl}
+Release: 15%{?dist}
Summary: Simplified Java NIO asynchronous sockets
License: MIT
-URL:
http://code.google.com/p/naga/
-# Upstream does not release stable source tarballs.
-# Tarball created with
-# svn checkout -r %{svnrel}
http://naga.googlecode.com/svn/trunk/ naga
-# rm -rf naga/.svn
-# tar jcf naga-%{svnrel}svn.tar.bz2 naga
-Source0: naga-%{svnrel}svn.tar.bz2
-# Force utf8
-Patch0: naga-encoding.patch
-BuildArch: noarch
+Source0: %{forgesource}
+# Fix javadoc errors and warnings
+Patch0: %{name}-javadoc.patch
+# Build for Java 1.8 and tell javac that the sources are UTF-8 encoded
+Patch1: %{name}-java18.patch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
+BuildArch: noarch
BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
-Requires: jpackage-utils
Requires: java-headless
+Requires: javapackages-filesystem
%description
Naga aims to be a very small NIO library that provides a handful of
@@ -44,17 +50,14 @@ flags.
%package javadoc
Summary: Javadocs for %{name}
-Requires: jpackage-utils
+Requires: javapackages-filesystem
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}
-%patch0 -p1 -b .encoding
-
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
+%forgesetup
+%autopatch -p1
%build
ant build javadoc
@@ -69,14 +72,20 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp _BUILD/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files
+%doc Echoserver.md Eventmachine.md Gotchas.md PacketReader.md README.md
+%license COPYING
%{_javadir}/naga.jar
%{_javadir}/naga-3_0.jar
%files javadoc
+%license COPYING
%{_javadocdir}/%{name}
-
%changelog
+* Tue Sep 29 2020 Jerry James <loganjerry(a)gmail.com> - 3.0-15.20200930git6f1e95d
+- Bring back to Fedora
+- Switch to github repo
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.0-14.82svn
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 84d9ce7..c1409c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91ba41df3304ea9ddc71996230326762 naga-82svn.tar.bz2
+SHA512 (naga-6f1e95ddfdb1aa7719c98168f0a5efc5be191426.tar.gz) =
70cad98219053d5e1dbb80c8396bbdfafe4ccb4a62a03f920ca38fd36a3664281d76e76c8cc650a06a948c4308616c2753a054d0a18a5de3786fc3144958ec8d
https://src.fedoraproject.org/rpms/naga/c/b50f793c6db68c123fe37f39f7c8887...