Accepting request 496565 from Java:packages

1

OBS-URL: https://build.opensuse.org/request/show/496565
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jline?expand=0&rev=19

jline.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 19 09:23:12 UTC 2017 - mpluskal@suse.com
+
+- Update dependencies 
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:13 UTC 2015 - tchvatal@suse.com
 

jline.spec

@@ -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 @@ Source0:        http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.z
 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
+Requires(postun): javapackages-tools
-BuildRequires:  xml-commons-resolver
+#!BuildIgnore:  antlr antlr-java
+BuildArch:      noarch
 %if %with maven
 BuildRequires:  maven-release
 BuildRequires:  maven-surefire-plugin
@@ -57,12 +63,6 @@ BuildRequires:  maven2-plugin-javadoc
 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 @@ applications. It features tab-completion, command history, password
 masking, customizable keybindings, and pass-through handlers to use to
 chain to other console applications.
 
-
-
 %package        demo
 Summary:        Java library for reading and editing user input in console applications
 Group:          Development/Libraries/Java
@@ -82,9 +80,6 @@ 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
 %setup -q -c
@@ -120,9 +115,9 @@ ant jar
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 src/target/jline.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 src/target/jline.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+(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