SHA256
1
0
forked from pool/jline

- Reduce depgraph and drop maven fragment to allow bootstrap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=18
This commit is contained in:
Tomáš Chvátal 2017-06-09 09:34:56 +00:00 committed by Git OBS Bridge
parent 5cb3837656
commit 99f71b8383
2 changed files with 5 additions and 47 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 9 09:35:59 UTC 2017 - tchvatal@suse.com
- Reduce depgraph and drop maven fragment to allow bootstrap
-------------------------------------------------------------------
Fri May 19 09:23:12 UTC 2017 - mpluskal@suse.com

View File

@ -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 @@ 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
#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 @@ find -type f -name '*.jar' | xargs -t rm
mkdir -p build
cp -p %{SOURCE1} build/CatalogManager.properties
cp -p %{SOURCE2} src/build.xml
%if %without maven
perl -p -i -e 's|^.*<attribute name="Class-Path".*||' build.xml
%endif
%build
mkdir -p native
# Use locally installed DTDs
export CLASSPATH=`pwd`/build
cd src/
%if %with maven
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%else
export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes
export OPT_JAR_LIST=:
ant jar
%endif
%install
# jars
@ -119,15 +78,9 @@ 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
%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_datadir}/maven-metadata/%{name}.xml*
%{_mavenpomdir}/*
%changelog