Accepting request 502533 from Java:packages

- Drop maven depmap so we can actually bootstrap

OBS-URL: https://build.opensuse.org/request/show/502533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rhino?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2017-06-10 16:32:56 +00:00 committed by Git OBS Bridge
commit 9d82e005cc
2 changed files with 9 additions and 14 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 9 09:59:36 UTC 2017 - tchvatal@suse.com
- Drop maven depmap so we can actually bootstrap
-------------------------------------------------------------------
Fri May 19 11:19:44 UTC 2017 - dziolkowski@suse.com

View File

@ -17,7 +17,6 @@
#
%define section free
%define cvs_version 1_7R3
Name: rhino
Version: 1.7R3
@ -50,7 +49,6 @@ Patch100: rhino-1.7-gcj.patch
BuildRequires: ant
BuildRequires: bea-stax-api
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jline
#BuildRequires: xerces-j2-bootstrap
@ -59,8 +57,10 @@ BuildRequires: xmlbeans-mini
#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
#!BuildIgnore: antlr antlr-java
#!BuildIgnore: xml-commons-jaxp-1.3-apis
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
Requires: bea-stax-api
Requires: jline
Requires: xmlbeans
@ -135,14 +135,6 @@ mkdir -p %{buildroot}%{_datadir}/%{name}
cp -a examples/* %{buildroot}%{_datadir}/%{name}
cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
# poms
mkdir -p %{buildroot}%{_mavenpomdir}
cp -a %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP-js.pom
cp -a %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar
%add_maven_depmap JPP-js.pom js.jar
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
@ -151,8 +143,6 @@ cp -a %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%attr(0755,root,root) %{_bindir}/%{name}-idswitch
%attr(0755,root,root) %{_bindir}/%{name}-jsc
%{_javadir}/*.jar
%{_mavenpomdir}/*
%{_datadir}/maven-metadata/%{name}.xml
%files demo
%defattr(0644,root,root,0755)