From c5b8ccf2008aada4c585e469ceb8a76da7b39237f8c6b01985b5d5b71e57d8c4 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 18 Jun 2012 13:25:37 +0000 Subject: [PATCH] - ignore jdk7 as well OBS-URL: https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=16 --- rhino.changes | 5 +++++ rhino.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/rhino.changes b/rhino.changes index 23f251a..2d63ac6 100644 --- a/rhino.changes +++ b/rhino.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 18 13:23:15 UTC 2012 - mvyskocil@suse.cz + +- ignore jdk7 as well + ------------------------------------------------------------------- Tue Jan 17 12:56:04 UTC 2012 - cfarrell@suse.com diff --git a/rhino.spec b/rhino.spec index 5296401..c8f7e5d 100644 --- a/rhino.spec +++ b/rhino.spec @@ -23,7 +23,7 @@ Name: rhino Version: 1.7R3 -Release: 1 +Release: 0 Summary: JavaScript for Java License: MPL-1.1 or GPL-2.0+ Group: Development/Libraries/Java @@ -54,18 +54,19 @@ Patch100: rhino-1.7-gcj.patch BuildRequires: ant BuildRequires: bea-stax-api +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: jline BuildRequires: jpackage-utils BuildRequires: xerces-j2-bootstrap BuildRequires: xmlbeans-mini -BuildRequires: java-1_5_0-gcj-compat-devel #!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 -Requires: jline Requires: bea-stax-api +Requires: jline Requires: xmlbeans BuildArch: noarch @@ -78,6 +79,7 @@ scripting to end users. %package demo Summary: JavaScript for Java +Group: Development/Libraries/Java %description demo Rhino is an open-source implementation of JavaScript written entirely @@ -86,6 +88,7 @@ scripting to end users. %package javadoc Summary: JavaScript for Java +Group: Development/Libraries/Java %description javadoc Rhino is an open-source implementation of JavaScript written entirely