Accepting request 1287888 from Java:packages

3.30.4

OBS-URL: https://build.opensuse.org/request/show/1287888
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jline3?expand=0&rev=7

0001-Remove-optional-dependency-on-universalchardet.patch

@@ -1,4 +1,4 @@
-From 1cf3f73c9ce89d9c49985ddb8dfef33ae9fd44c8 Mon Sep 17 00:00:00 2001
+From f3eda0bf4fa1b9efb0562224fa3c090ba59f0253 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 26 Feb 2025 16:26:49 +0100
 Subject: [PATCH] Remove optional dependency on universalchardet
@@ -8,18 +8,18 @@ Subject: [PATCH] Remove optional dependency on universalchardet
  1 file changed, 12 deletions(-)
 
 diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
-index 765cea7c..47501ee1 100644
+index 491d0bc3..be5748c1 100644
 --- a/builtins/src/main/java/org/jline/builtins/Nano.java
 +++ b/builtins/src/main/java/org/jline/builtins/Nano.java
-@@ -47,7 +47,6 @@ import org.jline.terminal.Terminal.Signal;
- import org.jline.terminal.Terminal.SignalHandler;
+@@ -51,7 +51,6 @@ import org.jline.terminal.impl.MouseSupport;
  import org.jline.utils.*;
  import org.jline.utils.InfoCmp.Capability;
+ import org.jline.utils.Status;
 -import org.mozilla.universalchardet.UniversalDetector;
  
  import static org.jline.builtins.SyntaxHighlighter.*;
  import static org.jline.keymap.KeyMap.KEYMAP_LENGTH;
-@@ -249,17 +248,6 @@ public class Nano implements Editor {
+@@ -380,17 +379,6 @@ public class Nano implements Editor {
              }
              byte[] bytes = bos.toByteArray();
  
@@ -38,5 +38,5 @@ index 765cea7c..47501ee1 100644
              try (BufferedReader reader =
                      new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes), charset))) {
 -- 
-2.48.1
+2.49.0
 

Load-native-library-system-wide-place.patch.in

@@ -1,11 +1,10 @@
 --- a/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
 +++ b/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
-@@ -328,6 +328,7 @@ public class JLineNativeLoader {
+@@ -499,6 +499,7 @@ public class JLineNativeLoader {
  
          // As a last resort try from java.library.path
          String javaLibraryPath = System.getProperty("java.library.path", "");
-+        javaLibraryPath = "@PREFIX@" + File.pathSeparator + javaLibraryPath;
++        javaLibraryPath = "@SYSTEMLIBRARYPATH@" + File.pathSeparator + javaLibraryPath;
          for (String ldPath : javaLibraryPath.split(File.pathSeparator)) {
              if (ldPath.isEmpty()) {
                  continue;
-

jline-3.30.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f764fe6d67fdab5e3a0db32a94a61b8404260b5fbebe3c15c18da7d3d6aa81e
+size 2798985

jline3-build.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:692c016b23ef23767b0b4fb8d8a31742d993fdd426dfca916214b67a2cdeabae
+size 5188

jline3.changes

@@ -1,3 +1,275 @@
+-------------------------------------------------------------------
+Mon Jun 23 09:32:33 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 3.30.4
+  * New features and improvements
+    + add pluggable completion to Nano editor (fixes #1194)
+    + enhanced MouseSupport to handle multiple mouse event formats
+      (SGR, URXVT, SGR-Pixels)
+    + add getCurrentMouseTracking to Terminal interface
+    + add ability to get terminal default foreground and background
+      colors
+    + add password masking support for dumb terminals (fixes #1172)
+    + add line numbers and current line marker to secondary prompt
+      (fix for #1151)
+    + Add support for separate encodings for stdin, stdout, and
+      stderr
+    + Make prompts work in non-fullscreen mode
+  * Bug Fixes
+    + use a fallback classloader suitable for java Modules or OSGi
+      environments (fixes #1185)
+    + NPE in Status#resize when supported is false (fixes #1191)
+    + nano editor exiting when pressing Ctrl+Space (fixes #1200)
+    + parse error of system default /usr/share/nano/*.nanorc
+    + Terminal.trackMouse(MouseTracking.Off) (fixes #1189)
+    + Make command execution order consistent in SystemRegistryImpl
+    + handle invalid entries in history files gracefully
+    + Properly fill screen lines with spaces when width is increased
+      in ScreenTerminal
+    + cursor position after Status.update()
+    + improve script file detection and execution in Groovy REPL,
+      fixes #1139
+    + ensure proper cleanup of pump threads in terminal
+      implementations
+    + add history line width check in ScreenTerminal.setSize()
+      (fixes #1206)
+    + console-ui example: catch UserInterruptException in place of
+      IOError
+    + Ctrl+Space handling on Windows terminals
+    + Update LineReaderImpl to use new readMouseEvent signature with
+      lastBinding parameter
+    + enhance nanorc loading and introduce a ClasspathResourceUtil
+      utility
+    + missing close in PosixSysTerminal.
+    + Jansi AnsiConsole broken color detection in uber jars
+    + SyntaxHighlighter glob pattern handling for non-default file
+      systems
+  * Documentation
+    + Integrate website into main repository
+    + improve JLineNativeLoader documentation and references
+    + fix readme
+    + Add comprehensive Javadoc to jline-builtins module
+    + improve Javadoc in console module
+    + add comprehensive Javadoc to org.jline.style package
+    + add comprehensive Javadoc to JLine Terminal and Reader
+    + Add missing DISABLE_EVENT_EXPANSION JavaDoc (fixes #1218)
+    + Make sure snippets compile
+    + Corrected the maven central link
+    + correct PicocliJLineExample snippet name in
+      library-integration.md
+    + validate code snippets during build time instead of runtime
+    + add missing @SInCE 3.30.0 annotations to new methods in
+      Terminal
+    + integrate GitHub wiki content into website documentation
+    + Improve website build system and documentation management
+    + fix javadoc redirect URL issue
+    + Add picocli links to library integration
+    + Mention InputRC on Builtins
+    + doc: update version to 3.30.0 and add Javadoc integration
+    + integrate ConsoleUI documentation into website
+    + add syntax highlighting example classes for documentation
+    + Expand DISABLE_EVENT_EXPANSION JavaDoc (re. #1238)
+    + Link to documentation website earlier in README (see #1240)
+    + Link to Pty4j on Terminal
+
+-------------------------------------------------------------------
+Fri Mar 28 06:02:04 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Rewrite to use Ant to build. This prevents potential cycles with
+  upcoming Maven 4
+
+-------------------------------------------------------------------
+Fri Mar 14 14:06:15 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 3.29.0
+  * Breaking changes
+    + Undeprecate ConsolePrompt methods et al
+  * New features and improvements
+    + Add text-only prompt element for console-ui
+    + Dynamic console-ui prompt improvements, see #1051
+  * Bug Fixes
+    + AnsiConsole should always obey the terminal
+    + Add overloaded no-arg compile method
+    + Move catch to proper place
+- Update to upstream version 3.28.0
+  * New features and improvements
+    + Dynamic console-ui prompts
+    + Add a AbstractTerminal#toString() method
+    + Let CommandRegistry create Candidate for completion
+    + Be more specific about which command is missing when throwing
+      an exception
+    + Add style for command description in completer
+    + Enhance DefaultHighlighter to support command styling
+    + Provide a simple RegistryImpl that can provide options from
+      LineReader
+  * Bug Fixes
+    + InputValue prompt with mask doesn't work correctly
+    + JLine exec provider should reject terminal creation on a
+      redirected output stream
+    + Fix ConsolePrompt.prompt() throwing IOError instead of
+      UserInterruptedException
+    + Fix possible NPE in TailTipWidgets
+- Update to upstream version 3.27.1
+  * Bug fixes (relative)
+    + Hexadecimal triple support in Jansi
+    + Fix ExecPty parsing on some Alpine linux
+    + Clean ShellFactoryImpl logging, add a test
+    + Fix GraalVM warning
+  * Tasks
+    + Configure central-publishing-maven-plugin manually
+- Update to upstream version 3.27.0
+  * Changes
+    + Fix tag name format for release
+    + Console UI ListChoice's (relative)pageSize is never used
+    + Added possibility of cancelling prompts
+    + [consoleui] Make it easier to extend ConsolePrompt
+    + fix typo: inMode -> outMode in ffm
+- Update to upstream version 3.26.3
+  * Bug fixes
+    + The Diag tool should display the full stack trace
+    + Correcting invocation of ScrollConsoleScreenBufferW - using
+      pointers instead of values.
+    + Fix windows-arm64 DLL name
+    + IndexOutOfBoundsException in console-ui when header exceeds
+      size of the terminal
+- Update to upstream version 3.26.2
+  * Bug fixes
+    + Add some doc for boolean provider methods in TerminalBuider
+    + INVALID_HANDLE_VALUE is a long
+    + Restore the use of Integer.MAX_VALUE for display colums when
+      size is zero
+    + Cursor badly positioned after creating Status bar
+    + Build with Cmd on Windows
+- Update to upstream version 3.26.1
+  * Changes
+    + Fix interrupt signal killing application
+    + Fix OutOfMemoryError when using TailTipWidget
+- Update to upstream version 3.26.0
+  * Changes
+    + Update GitHub Actions
+    + In maven-wrapper.properties, sync maven version with pom.xml
+    + Update maven to 3.9.6
+    + Fixing the FfmTerminal to run on JDK 22 and on Linux.
+    + Provide jdk8 jar by excluding the FFM support
+    + Exclude directories when locating tty, test etc
+    + Return early from LineReaderImpl.doList if no possibilities
+      or rows
+    + Fix native image compilation
+    + Use default sort order when custom sort order is identical
+    + Disable Quick Edit Mode with mouse support
+    + Don't change keybindings to emacs for dumb terminals
+    + Merge ConsoleUI project into JLine
+    + Don't attempt line break at last line
+    + Fix remote terminal on linux/bsd
+    + Warn when using a deprecated provider
+    + Improve status bar drawing mechanism
+    + Upgrade maven wrapper
+    + Switch the nativeSignals boolean to true by default
+    + Simplify graal demo
+- Update to upstream version 3.25.1
+  * Changes
+    + Fix source jars required for bundles
+    + Native libraries are not embedded in JLine bundle
+    + Fix NPE on windows with missing jna/jansi
+    + Fix native image metadata
+- Update to upstream version 3.25.0
+  * Changes
+    + Merge Jansi library into JLine
+    + Fix missing native libraries in JLine bundle
+    + Avoid JDK warning when checking the exec provider
+    + Improve the message when a provider cannot be used by doing
+      an early check and restore compatibility with Jansi 1.17
+    + Provide a new Terminal InputFlag INORMEOL to normalize end of
+      lines
+    + Add the ability to clear internal buffers
+    + Use logger instead of writing to stderr
+    + Fix FFM provider loading of openpty on linux
+    + Add some doc about Signal.QUIT which cannot be caught by the
+      JVM
+- Update to upstream version 3.24.1
+  * Changes
+    + Fix broken javadoc generation
+    + Restore JDK 8 runtime compatibility
+    + Restore partial failure handling with stty
+    + Fix git line endings
+- Update to upstream version 3.24.0
+  * New features and enhancements
+    + Add forced-out and forcer-err to force the system console to
+      use the output / error stream
+    + Add a field / setter for the forced provider
+    + Support providing default values for line reader variables
+      using system properties
+    + Support automatic parsing of an inputrc file in jline reader
+    + Add a property to customize the tab width
+    + Force creation of a dumb terminal if TERM starts with dumb
+    + New JNI provider
+    + Switch to junit 5
+    + Require JDK 11 and support JDK 21 at build time
+    + Enable spotless on JDK 21
+    + Support building on JDK 21
+  * Bug fixes
+    + Make sure the thread is not in an interrupted state when
+      cleanup up
+    + Fix cr/lf support in dumb terminals
+    + AIX issue with non english locales
+    + Add a property to force a given provider
+    + org.jline.util.PumpReader signed byte problem
+    + Fix possible OOM caused by huge repetitions of inserts
+    + Improve toString() terminal rendering
+    + Use simplified keymap for dumb terminal
+    + Improve robustness of initial cleanup
+    + Add missing space in SunOS-sparcv9_CCFLAGS
+    + Fix history trim for non-timestamped files
+    + Fix build on linux arm64 and add riscv64
+    + Fix eol
+    + Clean a bit TerminalBuilder
+    + Add TerminalExt interface
+    + FFM support
+    + Break dependency between org.jline.terminal.impl and
+      org.jline.terminal.impl.exec package
+    + Close Files streams using try-with-resources
+    + Fix illegal reflective access in exec provider
+    + Make sure libraries are binaries
+    + Simplify CI
+    + Builtin Less has an IndexOutOfBoundsException when seeking to
+      the end of the file
+    + LineReader Bug
+    + Add a warning when using the ExecTerminalProvider on recent
+      JDKs
+    + Fix detection of utilities
+    + Fix shell output going to stderr rather than stdout
+    + Fix TerminalProvider sorting
+    + Use Objects.hashCode instead of Objects.hash to avoid vararg
+      array creation
+    + spotless: set the line endings to
+- Update to upstream version 3.23.0
+  * Changes
+    + Optimize Styles.isStylePattern() to avoid StackOverflowError
+    + Use a native library to create FileDescriptors if reflection
+      does not allow access
+    + Allow custom sort of providers, and prefer jansi by default
+    + Fix restoration of Terminal at close
+    + Decode alternate charset in/out sequences when building
+      AttributedString
+    + Fix AltGr+Shift characters
+    + Add missing ConEmu capabilities
+    + Ioctl improvements
+    + Refine color support in various environments
+    + Fix signal processing on windows
+    + Add autoformat using spotless
+- Do not build by default the jline3-remote-ssh to avoid hard
+  dependency on apache-sshd. The build is still possible by
+  specifying --with ssh
+- Do not build by default the jline3-terminal-ffm, since it
+  requires java >= 22. The build is still possible by specifying
+  --with ffm
+- Added patch:
+  * 0001-Remove-optional-dependency-on-universalchardet.patch
+    + Do not depend on the optional juniversalchardet
+- Added template patch:
+  * Load-native-library-system-wide-place.patch.in
+    + Load the native library from system-wide place
+
 -------------------------------------------------------------------
 Fri Oct 11 07:41:55 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

jline3.spec

@@ -24,26 +24,34 @@ find most of the command editing features of JLine to be familiar.\
 \
 JLine 3.x is an evolution of JLine 2.x.
 %bcond_with ssh
+%bcond_with ffm
 Name:           jline3
-Version:        3.29.0
+Version:        3.30.4
 Release:        0
 Summary:        Java library for handling console input
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 URL:            https://github.com/jline/jline3
 Source0:        %{url}/archive/refs/tags/jline-%{version}.tar.gz
-Source1:        Load-native-library-form-usr-lib-jline.patch.in
+Source1:        %{name}-build.tar.xz
+Source100:      Load-native-library-system-wide-place.patch.in
 Patch0:         0001-Remove-optional-dependency-on-universalchardet.patch
+BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(net.java.dev.jna:jna)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.fusesource.jansi:jansi)
+BuildRequires:  jansi
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  jna
+BuildRequires:  jsr-305
 %if %{with ssh}
-BuildRequires:  mvn(org.apache.sshd:sshd-core)
-BuildRequires:  mvn(org.apache.sshd:sshd-scp)
-BuildRequires:  mvn(org.apache.sshd:sshd-sftp)
+BuildRequires:  apache-sshd
+BuildRequires:  slf4j
+%endif
+%if %{with ffm}
+BuildRequires:  java-devel >= 22
+BuildConflicts: java <= 21
+BuildConflicts: java-devel <= 21
+BuildConflicts: java-headless <= 21
 %endif
 
 %description
@@ -55,13 +63,6 @@ find most of the command editing features of JLine to be familiar.
 
 JLine 3.x is an evolution of JLine 2.x.
 
-%package parent
-Summary:        JLine Parent
-BuildArch:      noarch
-
-%description parent
-%{desc}
-
 %package builtins
 Summary:        JLine Builtins
 BuildArch:      noarch
@@ -153,6 +154,15 @@ BuildArch:      noarch
 This package contains the helpers for using jline with Mina SSHD.
 %endif
 
+%if %{with ffm}
+%package terminal-ffm
+Summary:        JLine FFM Terminal
+BuildArch:      noarch
+
+%description terminal-ffm
+%{desc}
+%endif
+
 %package style
 Summary:        JLine Style
 BuildArch:      noarch
@@ -206,9 +216,9 @@ BuildArch:      noarch
 API documentation for %{name}.
 
 %prep
-%autosetup -n %{name}-jline-%{version} -p1
+%autosetup -n %{name}-jline-%{version} -p1 -a1
 
-sed "s;@PREFIX@;%{_libdir}/%{name}/;g" < %{SOURCE1} | patch -p1
+sed "s;@SYSTEMLIBRARYPATH@;%{_libdir}/%{name}/;g" < %{SOURCE100} | patch -p1
 
 cp -p console-ui/LICENSE.txt LICENSE-APACHE.txt
 
@@ -221,11 +231,11 @@ sed -i /-Werror/d $(find -name pom.xml)
 # Optional dependency on juniversalchardet was removed via a patch
 %pom_remove_dep -r :juniversalchardet . jline
 
-# Disable FFM module for now
-# TODO enable FFM when switching to Java 25
+%if %{without ffm}
 %pom_disable_module terminal-ffm
 %pom_remove_dep :jline-terminal-ffm jline
 %pom_xpath_remove "pom:executions/pom:execution[pom:id='jdk22']" jline
+%endif
 
 # Disable unwanted modules
 %pom_disable_module groovy
@@ -240,7 +250,6 @@ sed -i /-Werror/d $(find -name pom.xml)
 %pom_remove_plugin :spotless-maven-plugin
 %pom_remove_plugin :maven-release-plugin
 %pom_remove_plugin :maven-deploy-plugin
-%pom_remove_plugin :central-publishing-maven-plugin
 %pom_remove_plugin :native-image-maven-plugin
 %pom_remove_plugin :maven-source-plugin
 
@@ -272,7 +281,9 @@ for module in \
     remote-telnet \
     style \
     terminal \
+%if %{with ffm}
     terminal-ffm \
+%endif
     terminal-jansi \
     terminal-jna \
     terminal-jni; do
@@ -300,23 +311,123 @@ for module in \
 done
 
 %build
+mkdir -p lib
+build-jar-repository -s lib \
+    jansi/jansi \
+    jna/jna \
+    jsr-305
+%if %{with ssh}
+  build-jar-repository -s lib \
+    apache-sshd/sshd-common \
+    apache-sshd/sshd-core \
+    apache-sshd/sshd-scp \
+    apache-sshd/sshd-sftp \
+    slf4j/api
+%endif
+
 # Build a native object
 gcc -Wall %{?build_cflags} %{?optflags} -fPIC -fvisibility=hidden -shared \
   -I native/src/main/native -I %{_jvmdir}/java/include \
   -I %{_jvmdir}/java/include/linux %{?build_ldflags} \
   -o libjlinenative.so native/src/main/native/{jlinenative,clibrary}.c
 
-# This is to avoid duplicate javadoc
-# First build with javadoc and without bundles
-%{mvn_build} -f -s -- -P\!bundle -Dnojavadoc=true
-# Remove reactor to avoid duplicate artifacts
-rm -rf .xmvn-reactor
-# Build without javadoc, but with bundles
-%{mvn_build} -fj -s -- -Dnojavadoc=true
+ant package javadoc
+%if %{with ssh}
+  ant -f remote-ssh package javadoc
+%endif
+%if %{with ffm}
+  ant -f terminal-ffm package javadoc
+%endif
 
 %install
-%mvn_install
+# jars
+install -dm 0755 %{buildroot}%{_jnidir}/%{name}
+install -pm 0644 jansi/target/jansi-%{version}.jar %{buildroot}%{_jnidir}/%{name}/jansi.jar
+install -pm 0644 jline/target/jline-%{version}.jar %{buildroot}%{_jnidir}/%{name}/jline.jar
+install -pm 0644 native/target/jline-native-%{version}.jar %{buildroot}%{_jnidir}/%{name}/jline-native.jar
+
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 jansi-core/target/jansi-core-%{version}.jar %{buildroot}%{_javadir}/%{name}/jansi-core.jar
+for i in \
+  builtins \
+  console \
+  console-ui \
+  curses reader \
+%if %{with ssh}
+  remote-ssh \
+%endif
+  remote-telnet \
+  style \
+  terminal \
+%if %{with ffm}
+  terminal-ffm \
+%endif
+  terminal-jansi \
+  terminal-jna \
+  terminal-jni; do
+    install -pm 0644 ${i}/target/jline-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/jline-${i}.jar
+done
+
+# poms
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+for i in \
+  jansi \
+  jansi-core \
+  jline; do
+    %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+    %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
+done
+
+for i in \
+  builtins \
+  console \
+  console-ui \
+  curses reader \
+  native \
+%if %{with ssh}
+  remote-ssh \
+%endif
+  remote-telnet \
+  style \
+  terminal \
+%if %{with ffm}
+  terminal-ffm \
+%endif
+  terminal-jansi \
+  terminal-jna \
+  terminal-jni; do
+    %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/jline-${i}.pom
+    %add_maven_depmap %{name}/jline-${i}.pom %{name}/jline-${i}.jar -f ${i}
+done
+
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+for i in \
+  builtins \
+  console \
+  console-ui \
+  curses reader \
+  jansi \
+  jansi-core \
+  jline \
+  native \
+%if %{with ssh}
+  remote-ssh \
+%endif
+  remote-telnet \
+  style \
+  terminal \
+%if %{with ffm}
+  terminal-ffm \
+%endif
+  terminal-jansi \
+  terminal-jna \
+  terminal-jni; do
+    cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
+done
 %fdupes %{buildroot}%{_javadocdir}/%{name}
+
+# native library
 install -d -m 755 %{buildroot}%{_libdir}/%{name}/
 install -p -m 755 libjlinenative.so %{buildroot}%{_libdir}/%{name}/
 
@@ -330,52 +441,55 @@ install -p -m 755 libjlinenative.so %{buildroot}%{_libdir}/%{name}/
 %files jansi-core -f .mfiles-jansi-core
 %license LICENSE.txt
 
-%files builtins -f .mfiles-jline-builtins
+%files builtins -f .mfiles-builtins
 %license LICENSE.txt
 
-%files console -f .mfiles-jline-console
+%files console -f .mfiles-console
 %license LICENSE.txt
 
-%files console-ui -f .mfiles-jline-console-ui
+%files console-ui -f .mfiles-console-ui
 %license LICENSE.txt
 
-%files curses -f .mfiles-jline-curses
+%files curses -f .mfiles-curses
 %license LICENSE.txt
 
-%files native -f .mfiles-jline-native
+%files native -f .mfiles-native
 %{_libdir}/%{name}
 %license LICENSE.txt
 
-%files reader -f .mfiles-jline-reader
+%files reader -f .mfiles-reader
 %license LICENSE.txt
 
 %if %{with ssh}
-%files remote-ssh -f .mfiles-jline-remote-ssh
+%files remote-ssh -f .mfiles-remote-ssh
 %license LICENSE.txt
 %endif
 
-%files remote-telnet -f .mfiles-jline-remote-telnet
+%if %{with ffm}
+%files terminal-ffm -f .mfiles-terminal-ffm
+%license LICENSE.txt
+%endif
+
+%files remote-telnet -f .mfiles-remote-telnet
 %license LICENSE.txt
 
-%files style -f .mfiles-jline-style
+%files style -f .mfiles-style
 %license LICENSE.txt
 
-%files terminal -f .mfiles-jline-terminal
+%files terminal -f .mfiles-terminal
 %license LICENSE.txt
 
-%files terminal-jansi -f .mfiles-jline-terminal-jansi
+%files terminal-jansi -f .mfiles-terminal-jansi
 %license LICENSE.txt
 
-%files terminal-jna -f .mfiles-jline-terminal-jna
+%files terminal-jna -f .mfiles-terminal-jna
 %license LICENSE.txt
 
-%files terminal-jni -f .mfiles-jline-terminal-jni
+%files terminal-jni -f .mfiles-terminal-jni
 %license LICENSE.txt
 
-%files parent -f .mfiles-jline-parent
-%license LICENSE.txt
-
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
 %license LICENSE.txt
 
 %changelog