diff --git a/jline.changes b/jline.changes index 5df0fbb..3c14a40 100644 --- a/jline.changes +++ b/jline.changes @@ -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 diff --git a/jline.spec b/jline.spec index fc6a990..45350b0 100644 --- a/jline.spec +++ b/jline.spec @@ -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|^.*