Accepting request 496626 from Java:packages

1

OBS-URL: https://build.opensuse.org/request/show/496626
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rhino?expand=0&rev=29

rhino.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 19 11:19:44 UTC 2017 - dziolkowski@suse.com
+
+- New build dependency: javapackages-local
+- spec cleaned using spec-cleaner
+
 -------------------------------------------------------------------
 Fri Feb 10 16:18:53 UTC 2017 - dimstar@opensuse.org
 

rhino.spec

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +19,6 @@
 
 %define section         free
 %define cvs_version     1_7R3
-
 Name:           rhino
 Version:        1.7R3
 Release:        0
@@ -28,7 +26,6 @@ Summary:        JavaScript for Java
 License:        MPL-1.1 or GPL-2.0+
 Group:          Development/Libraries/Java
 Url:            http://www.mozilla.org/rhino/
-
 # wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
 # unzip -q rhino%{cvs_version}.zip
 # find rhino%{cvs_version}/ -name '*jar' | xargs rm -rf
@@ -41,7 +38,6 @@ Source5:        rhino-jsc.script
 Source6:        rhino-js.pom
 Source7:        rhino.pom
 Source8:        rhino-component-info.xml
-
 Patch0:         rhino-build.patch
 # Add OSGi metadata from Eclipse Orbit project
 # Rip out of MANIFEST.MF included in this JAR:
@@ -51,10 +47,10 @@ Patch2:         %{name}-1.7R3-crosslink.patch
 Patch3:         rhino-288467.patch
 #PATCH-FIX-OPENSUSE: allow build under gcj
 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
@@ -65,13 +61,11 @@ BuildRequires:  xmlbeans-mini
 #!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:       bea-stax-api
 Requires:       jline
 Requires:       xmlbeans
-
-BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 Rhino is an open-source implementation of JavaScript written entirely
@@ -102,11 +96,11 @@ sed -i -e '/^Class-Path:.*$/d' src/manifest
 sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
 
 %setup -q -n %{name}%{cvs_version}
-%patch0 -p0 -b .build
+%patch0  -b .build
 %patch1 -p1 -b .fixManifest
 %patch2 -p1 -b .crosslink
-%patch3 -p0 -b .sav3
-%patch100 -p0 -b .gjc
+%patch3  -b .sav3
+%patch100  -b .gjc
 
 %build
 export CLASSPATH=$(build-classpath jline)
@@ -114,7 +108,7 @@ export OPT_JAR_LIST=:
 %{ant} -v -d \
     -Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \
     -Djsr173.jar=$(build-classpath bea-stax-api) \
-    deepclean jar copy-all 
+    deepclean jar copy-all
 
 pushd examples
 export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
@@ -149,9 +143,6 @@ cp -a %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 %add_maven_depmap JPP-js.pom js.jar
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt