commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2019-09-30 15:58:47
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new.2352 (New)
Package is "jline"
Mon Sep 30 15:58:47 2019 rev:24 rq:733686 version:2.14.6
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2019-07-02
10:38:49.190620527 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new.2352/jline.changes2019-09-30
15:58:50.553305468 +0200
@@ -1,0 +2,7 @@
+Fri Sep 27 07:34:45 UTC 2019 - Fridrich Strba
+
+- Added patch:
+ * jline-java8compat.patch
++ build binaries compatible with Java 8
+
+---
New:
jline-java8compat.patch
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.oubt8L/_old 2019-09-30 15:58:51.117303967 +0200
+++ /var/tmp/diff_new_pack.oubt8L/_new 2019-09-30 15:58:51.121303956 +0200
@@ -25,6 +25,7 @@
URL:https://github.com/jline/jline2
Source0:https://github.com/jline/jline2/archive/jline-%{version}.tar.gz
Source1:%{name}-build.xml
+Patch0: jline-java8compat.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: hawtjni-runtime
@@ -50,6 +51,7 @@
%prep
%setup -q -n jline2-jline-%{version}
+%patch0 -p1
%pom_change_dep org.fusesource.jansi:jansi org.fusesource.jansi:jansi:1.12
cp %{SOURCE1} build.xml
mkdir -p lib
++ jline-java8compat.patch ++
diff -urEbwB
jline2-jline-2.14.6/src/main/java/jline/internal/InputStreamReader.java
jline2-jline-2.14.6.new/src/main/java/jline/internal/InputStreamReader.java
--- jline2-jline-2.14.6/src/main/java/jline/internal/InputStreamReader.java
2018-03-26 11:14:37.0 +0200
+++ jline2-jline-2.14.6.new/src/main/java/jline/internal/InputStreamReader.java
2019-09-27 09:31:17.518979605 +0200
@@ -13,6 +13,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -68,7 +69,7 @@
decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
CodingErrorAction.REPLACE).onUnmappableCharacter(
CodingErrorAction.REPLACE);
-bytes.limit(0);
+((Buffer)bytes).limit(0);
}
/**
@@ -101,7 +102,7 @@
throw (UnsupportedEncodingException)
new UnsupportedEncodingException(enc).initCause(e);
}
-bytes.limit(0);
+((Buffer)bytes).limit(0);
}
/**
@@ -118,7 +119,7 @@
dec.averageCharsPerByte();
this.in = in;
decoder = dec;
-bytes.limit(0);
+((Buffer)bytes).limit(0);
}
/**
@@ -136,7 +137,7 @@
decoder = charset.newDecoder().onMalformedInput(
CodingErrorAction.REPLACE).onUnmappableCharacter(
CodingErrorAction.REPLACE);
-bytes.limit(0);
+((Buffer)bytes).limit(0);
}
/**
@@ -262,7 +263,7 @@
} else if (was_red == 0) {
break;
}
-bytes.limit(bytes.limit() + was_red);
+((Buffer)bytes).limit(bytes.limit() + was_red);
needInput = false;
}
@@ -273,8 +274,8 @@
// compact the buffer if no space left
if (bytes.limit() == bytes.capacity()) {
bytes.compact();
-bytes.limit(bytes.position());
-bytes.position(0);
+((Buffer)bytes).limit(bytes.position());
+((Buffer)bytes).position(0);
}
needInput = true;
} else {
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2019-07-02 10:38:47
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new.4615 (New)
Package is "jline"
Tue Jul 2 10:38:47 2019 rev:23 rq:712781 version:2.14.6
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2019-03-10
09:32:28.700218627 +0100
+++ /work/SRC/openSUSE:Factory/.jline.new.4615/jline.changes2019-07-02
10:38:49.190620527 +0200
@@ -1,0 +2,6 @@
+Thu Jun 27 09:06:19 UTC 2019 - Fridrich Strba
+
+- Work around a problem with dependency resolution, where variables
+ are not resolved
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.kf4zoP/_old 2019-07-02 10:38:49.870621562 +0200
+++ /var/tmp/diff_new_pack.kf4zoP/_new 2019-07-02 10:38:49.870621562 +0200
@@ -50,6 +50,7 @@
%prep
%setup -q -n jline2-jline-%{version}
+%pom_change_dep org.fusesource.jansi:jansi org.fusesource.jansi:jansi:1.12
cp %{SOURCE1} build.xml
mkdir -p lib
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2019-03-10 09:32:21
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new.28833 (New)
Package is "jline"
Sun Mar 10 09:32:21 2019 rev:22 rq:681810 version:2.14.6
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2017-09-29
11:52:07.558387730 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new.28833/jline.changes 2019-03-10
09:32:28.700218627 +0100
@@ -1,0 +2,26 @@
+Tue Mar 5 15:08:16 UTC 2019 - Fridrich Strba
+
+- Upgrade to version 2.14.6
+ * NOT backward compatible with jline 1.x
+ * Depend on jansi 2.9+
+ * #277: Allow setting max history-size. 'FileHistory' allows
+delayed init (to allow setMaxSize to take effect) and
+ 'ConsoleReader' exposes ability to read inputrc settings.
+ * Ability to control terminal encoding
+ * Backward history searching
+ * Handle EOF / Ctrl-D on unsupported terminals
+ * Distinguish carriage return from newline
+ * Correcting Manifest to make jline work as a bundle in OSGi
+ * Handle TERM=dumb as an UnsupportedTerminal
+ * Updated license headers to be consistent BSD version
+ * Added support for vi keymap. Most major vi features should work.
+ * The "jline.esc.timeout" configuration option (in your
+$HOME/.jline.rc) controls the number of millisesconds that
+ jline will wait after seeing an ESC key to see if another
+ character arrives.
+ * The JVM shutdown hook that restores the terminal settings when
+the JVM exits (jline.shutdownhook) is now turned on by default.
+- Generate and customize the ant build file in order to be able
+ to build without maven.
+
+---
Old:
CatalogManager.properties
jline-0.9.94.pom
jline-0.9.94.zip
New:
jline-2.14.6.tar.gz
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.DCFeB1/_old 2019-03-10 09:32:31.512217922 +0100
+++ /var/tmp/diff_new_pack.DCFeB1/_new 2019-03-10 09:32:31.552217912 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jline
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: jline
-Version:0.9.94
+Version:2.14.6
Release:0
Summary:Java library for reading and editing user input in console
applications
License:BSD-3-Clause
Group: Development/Libraries/Java
-Url:http://jline.sourceforge.net/
-Source0:
http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip
-Source1:CatalogManager.properties
-Source2:jline-build.xml
-Source3:jline-0.9.94.pom
+URL:https://github.com/jline/jline2
+Source0:https://github.com/jline/jline2/archive/jline-%{version}.tar.gz
+Source1:%{name}-build.xml
BuildRequires: ant
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
-BuildRequires: unzip
-BuildRequires: xml-commons-resolver
-#!BuildIgnore: antlr
-#!BuildIgnore: antlr-java
+BuildRequires: fdupes
+BuildRequires: hawtjni-runtime
+BuildRequires: jansi
+BuildRequires: jansi-native
+BuildRequires: javapackages-local
+#!BuildIgnore: ant-antlr
+Requires: mvn(org.fusesource.jansi:jansi)
BuildArch: noarch
%description
@@ -42,45 +41,51 @@
masking, customizable keybindings, and pass-through handlers to use to
chain to other console applications.
-%packagedemo
-Summary:Java library for reading and editing user input in console
applications
-Group: Development/Libraries/Java
+%package javadoc
+Summary:Javadocs for %{name}
+Group: Documentation/HTML
-%descriptiondemo
-JLine is a java library for reading and editing user input in console
-applications. It features tab-completion, command history, password
-masking, customizable keybindings, and pass-through handlers to use to
-chain to other console applications.
+%description javadoc
+This package contains the API documentation for %{name}.
%prep
-# BEWARE: The jar file META-INF is not under the subdir
-%setup -q -c
-cp -pr %{name}-%{version}/* .
-rm -r %{name}-%{version}
-find -type f -name '*.jar' | xargs -t rm
-# Use locall
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2017-09-29 11:52:04
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline"
Fri Sep 29 11:52:04 2017 rev:21 rq:529001 version:0.9.94
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2017-06-10
18:32:46.301806294 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2017-09-29
11:52:07.558387730 +0200
@@ -1,0 +2,8 @@
+Wed Sep 27 16:55:31 UTC 2017 - fst...@suse.com
+
+- Don't require java-1_5_0-gcj-compat, but build with any
+ java-devel provider
+- Specify java source and target level 1.6: fixes build with
+ jdk9
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.CY1F38/_old 2017-09-29 11:52:09.150163267 +0200
+++ /var/tmp/diff_new_pack.CY1F38/_new 2017-09-29 11:52:09.154162704 +0200
@@ -28,11 +28,12 @@
Source2:jline-build.xml
Source3:jline-0.9.94.pom
BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: unzip
BuildRequires: xml-commons-resolver
-#!BuildIgnore: antlr antlr-java
+#!BuildIgnore: antlr
+#!BuildIgnore: antlr-java
BuildArch: noarch
%description
@@ -70,7 +71,7 @@
cd src/
export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes
export OPT_JAR_LIST=:
-ant jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar
%install
# jars
@@ -79,7 +80,6 @@
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
%files
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2017-06-10 18:32:45
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline"
Sat Jun 10 18:32:45 2017 rev:20 rq:502528 version:0.9.94
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2017-05-31
13:28:56.095187940 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2017-06-10
18:32:46.301806294 +0200
@@ -1,0 +2,5 @@
+Fri Jun 9 09:35:59 UTC 2017 - tchva...@suse.com
+
+- Reduce depgraph and drop maven fragment to allow bootstrap
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.NGCO0n/_old 2017-06-10 18:32:46.901721470 +0200
+++ /var/tmp/diff_new_pack.NGCO0n/_new 2017-06-10 18:32:46.905720905 +0200
@@ -16,14 +16,6 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
-%define section free
-%define repo_dir.m2/repository
-%bcond_without maven
Name: jline
Version:0.9.94
Release:0
@@ -37,32 +29,11 @@
Source3:jline-0.9.94.pom
BuildRequires: ant
BuildRequires: java-1_5_0-gcj-compat-devel
-# Needed for maven conversions
-BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: unzip
BuildRequires: xml-commons-resolver
-Requires: /bin/sh
-Requires: /bin/stty
-#bnc#816314: for update_maven_depmap
-Requires(post): findutils
-Requires(post): javapackages-tools
-Requires(postun): findutils
-Requires(postun): javapackages-tools
#!BuildIgnore: antlr antlr-java
BuildArch: noarch
-%if %with maven
-BuildRequires: maven-release
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven2
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-%endif
%description
JLine is a java library for reading and editing user input in console
@@ -90,28 +61,16 @@
mkdir -p build
cp -p %{SOURCE1} build/CatalogManager.properties
cp -p %{SOURCE2} src/build.xml
-%if %without maven
perl -p -i -e 's|^.*
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2017-05-31 13:28:54
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline"
Wed May 31 13:28:54 2017 rev:19 rq:496565 version:0.9.94
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2015-04-02
15:57:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2017-05-31
13:28:56.095187940 +0200
@@ -1,0 +2,5 @@
+Fri May 19 09:23:12 UTC 2017 - mplus...@suse.com
+
+- Update dependencies
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.FAxodF/_old 2017-05-31 13:28:56.823085342 +0200
+++ /var/tmp/diff_new_pack.FAxodF/_new 2017-05-31 13:28:56.823085342 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jline
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,10 +21,9 @@
%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
%define _without_maven 1
-%bcond_without maven
%define section free
%define repo_dir.m2/repository
-
+%bcond_without maven
Name: jline
Version:0.9.94
Release:0
@@ -36,15 +35,22 @@
Source1:CatalogManager.properties
Source2:jline-build.xml
Source3:jline-0.9.94.pom
+BuildRequires: ant
+BuildRequires: java-1_5_0-gcj-compat-devel
+# Needed for maven conversions
+BuildRequires: javapackages-local
+BuildRequires: javapackages-tools
+BuildRequires: unzip
+BuildRequires: xml-commons-resolver
Requires: /bin/sh
Requires: /bin/stty
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
#bnc#816314: for update_maven_depmap
Requires(post): findutils
+Requires(post): javapackages-tools
Requires(postun): findutils
-BuildRequires: javapackages-tools
-BuildRequires: xml-commons-resolver
+Requires(postun): javapackages-tools
+#!BuildIgnore: antlr antlr-java
+BuildArch: noarch
%if %with maven
BuildRequires: maven-release
BuildRequires: maven-surefire-plugin
@@ -57,12 +63,6 @@
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
%endif
-BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: unzip
-#!BuildIgnore: antlr antlr-java
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
JLine is a java library for reading and editing user input in console
@@ -70,8 +70,6 @@
masking, customizable keybindings, and pass-through handlers to use to
chain to other console applications.
-
-
%packagedemo
Summary:Java library for reading and editing user input in console
applications
Group: Development/Libraries/Java
@@ -82,9 +80,6 @@
masking, customizable keybindings, and pass-through handlers to use to
chain to other console applications.
-
-
-
%prep
# BEWARE: The jar file META-INF is not under the subdir
%setup -q -c
@@ -120,9 +115,9 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 src/target/jline.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 src/target/jline.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
# pom
install -pD -T -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2015-04-02 15:57:20
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline"
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2013-09-11
13:38:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2015-04-02
15:57:21.0 +0200
@@ -1,0 +2,5 @@
+Wed Mar 18 09:46:13 UTC 2015 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.LqoKMO/_old 2015-04-02 15:57:22.0 +0200
+++ /var/tmp/diff_new_pack.LqoKMO/_new 2015-04-02 15:57:22.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jline
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -132,7 +132,7 @@
%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
-%config %{_mavendepmapfragdir}/*
+%{_datadir}/maven-metadata/%{name}.xml*
%{_mavenpomdir}/*
%changelog
commit jline for openSUSE:Factory
Hello community, here is the log from the commit of package jline for openSUSE:Factory checked in at 2013-09-11 13:38:28 Comparing /work/SRC/openSUSE:Factory/jline (Old) and /work/SRC/openSUSE:Factory/.jline.new (New) Package is "jline" Changes: --- /work/SRC/openSUSE:Factory/jline/jline.changes 2013-08-30 11:37:41.0 +0200 +++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2013-09-11 13:38:29.0 +0200 @@ -1,0 +2,5 @@ +Mon Sep 9 11:06:04 UTC 2013 - tchva...@suse.com + +- Move from jpackage-utils to javapackage-tools + +--- Other differences: -- ++ jline.spec ++ --- /var/tmp/diff_new_pack.XFNoVu/_old 2013-09-11 13:38:30.0 +0200 +++ /var/tmp/diff_new_pack.XFNoVu/_new 2013-09-11 13:38:30.0 +0200 @@ -38,12 +38,12 @@ Source3:jline-0.9.94.pom Requires: /bin/sh Requires: /bin/stty -Requires(post): jpackage-utils -Requires(postun): jpackage-utils +Requires(post): javapackages-tools +Requires(postun): javapackages-tools #bnc#816314: for update_maven_depmap Requires(post): findutils Requires(postun): findutils -BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: javapackages-tools BuildRequires: xml-commons-resolver %if %with maven BuildRequires: maven-release -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2013-08-30 11:37:40
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline"
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2013-04-26
12:37:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2013-08-30
11:37:41.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 26 07:57:51 UTC 2013 - mvysko...@suse.com
+
+- use new add_maven_depmap from javapackages-utils
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.Tq6rSY/_old 2013-08-30 11:37:42.0 +0200
+++ /var/tmp/diff_new_pack.Tq6rSY/_new 2013-08-30 11:37:42.0 +0200
@@ -84,17 +84,6 @@
-%packagejavadoc
-Summary:Java library for reading and editing user input in console
applications
-Group: Development/Libraries/Java
-
-%descriptionjavadoc
-JLine is a java library for reading and editing user input in console
-applications. It features tab-completion, command history, password
-masking, customizable keybindings, and pass-through handlers to use to
-chain to other console applications.
-
-
%prep
# BEWARE: The jar file META-INF is not under the subdir
@@ -126,7 +115,7 @@
%else
export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes
export OPT_JAR_LIST=:
-ant jar javadoc
+ant jar
%endif
%install
@@ -134,34 +123,16 @@
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 src/target/jline.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -p -m 644 %{SOURCE3}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr src/target/site/apidocs/*
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+# pom
+install -pD -T -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
-%{_datadir}/maven2/poms/*
%config %{_mavendepmapfragdir}/*
-
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%{_mavenpomdir}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jline for openSUSE:Factory
Hello community,
here is the log from the commit of package jline for openSUSE:Factory checked
in at 2013-04-26 07:37:58
Comparing /work/SRC/openSUSE:Factory/jline (Old)
and /work/SRC/openSUSE:Factory/.jline.new (New)
Package is "jline", Maintainer is "bmaryn...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/jline/jline.changes 2011-09-23
02:04:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.jline.new/jline.changes 2013-04-26
07:38:14.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 25 09:21:43 UTC 2013 - mvysko...@suse.com
+
+- add findutils dependency (bnc#816314)
+
+---
Other differences:
--
++ jline.spec ++
--- /var/tmp/diff_new_pack.d09B07/_old 2013-04-26 07:38:28.0 +0200
+++ /var/tmp/diff_new_pack.d09B07/_new 2013-04-26 07:38:28.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package jline (Version 0.9.94)
+# spec file for package jline
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,11 +27,11 @@
Name: jline
Version:0.9.94
-Release:10
+Release:0
Summary:Java library for reading and editing user input in console
applications
License:BSD-3-Clause
-Url:http://jline.sourceforge.net/
Group: Development/Libraries/Java
+Url:http://jline.sourceforge.net/
Source0:
http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip
Source1:CatalogManager.properties
Source2:jline-build.xml
@@ -40,9 +40,14 @@
Requires: /bin/stty
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
+#bnc#816314: for update_maven_depmap
+Requires(post): findutils
+Requires(postun): findutils
BuildRequires: jpackage-utils >= 1.7.2
BuildRequires: xml-commons-resolver
%if %with maven
+BuildRequires: maven-release
+BuildRequires: maven-surefire-plugin
BuildRequires: maven2
BuildRequires: maven2-plugin-assembly
BuildRequires: maven2-plugin-compiler
@@ -51,12 +56,10 @@
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
-BuildRequires: maven-release
-BuildRequires: maven-surefire-plugin
%endif
-BuildRequires: unzip
BuildRequires: ant
BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: unzip
#!BuildIgnore: antlr antlr-java
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -70,7 +73,6 @@
%packagedemo
-License:BSD-3-Clause
Summary:Java library for reading and editing user input in console
applications
Group: Development/Libraries/Java
@@ -83,7 +85,6 @@
%packagejavadoc
-License:BSD-3-Clause
Summary:Java library for reading and editing user input in console
applications
Group: Development/Libraries/Java
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jline for openSUSE:Factory
Hello community, here is the log from the commit of package jline for openSUSE:Factory checked in at 2011-12-06 18:20:45 Comparing /work/SRC/openSUSE:Factory/jline (Old) and /work/SRC/openSUSE:Factory/.jline.new (New) Package is "jline", Maintainer is "bmaryn...@suse.com" Changes: Other differences: -- ++ jline.spec ++ --- /var/tmp/diff_new_pack.qrBreD/_old 2011-12-06 18:35:59.0 +0100 +++ /var/tmp/diff_new_pack.qrBreD/_new 2011-12-06 18:35:59.0 +0100 @@ -29,7 +29,7 @@ Version:0.9.94 Release:10 Summary:Java library for reading and editing user input in console applications -License:BSD3c(or similar) +License:BSD-3-Clause Url:http://jline.sourceforge.net/ Group: Development/Libraries/Java Source0: http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip @@ -70,7 +70,7 @@ %packagedemo -License:BSD3c(or similar) +License:BSD-3-Clause Summary:Java library for reading and editing user input in console applications Group: Development/Libraries/Java @@ -83,7 +83,7 @@ %packagejavadoc -License:BSD3c(or similar) +License:BSD-3-Clause Summary:Java library for reading and editing user input in console applications Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
