Accepting request 240330 from Java:packages

javapackages updates submission

OBS-URL: https://build.opensuse.org/request/show/240330
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bcel?expand=0&rev=22

bcel.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  8 10:59:06 UTC 2014 - tchvatal@suse.com
+
+- Do not depend on ant-nodeps.
+
 -------------------------------------------------------------------
 Tue Sep  3 14:26:25 UTC 2013 - mvyskocil@suse.com
 

bcel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bcel
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,37 +14,33 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define manual  0
-
 Name:           bcel
 Version:        5.2
 Release:        0
 Summary:        Byte Code Engineering Library
 License:        Apache-2.0
 Group:          Development/Libraries/Java
+Url:            http://commons.apache.org/proper/commons-bcel/
 Source0:        http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz
 Source1:        http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc
 Source2:        bcel.keyring
-Url:            http://commons.apache.org/proper/commons-bcel/
-Requires:       regexp
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  ant
 BuildRequires:  gpg-offline
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  regexp
 #BuildRequires:  xerces-j2-bootstrap
-#!BuildIgnore:  xerces-j2-bootstrap
-BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis xml-commons-resolver xml-commons xerces-j2
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
 #!BuildIgnore:  java-1_6_0-openjdk-devel
 #!BuildIgnore:  java-1_7_0-openjdk-devel
-BuildRequires:  ant-nodeps
+#!BuildIgnore:  xerces-j2-bootstrap
+BuildRequires:  xml-commons-apis-bootstrap
+Requires:       regexp
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Byte Code Engineering Library is intended to give users a
@@ -68,8 +64,7 @@ It contains a byte code verifier named JustIce, which usually gives you
 much better information about what is wrong with your code than the
 standard JVM message.
 
-%if %manual
+%if %{manual}
-
 %package manual
 Summary:        Manual for bcel
 Group:          Development/Libraries/Java
@@ -97,8 +92,6 @@ It contains a byte code verifier named JustIce, which usually gives you
 much better information about what's wrong with your code than the
 standard JVM message.
 
-
-
 %endif
 
 %prep
@@ -113,26 +106,24 @@ touch manifest.txt
 %build
 export CLASSPATH=%(build-classpath regexp)
 export OPT_JAR_LIST="ant/ant-nodeps"
-%ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile
+%{ant} -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile
-%ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar
+%{ant} -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar
 
 %install
 # jars
-%__mkdir_p %{buildroot}%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
-%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/*
 
-%if %manual
+%if %{manual}
-
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/*
 %endif
-# -----------------------------------------------------------------------------
 
 %changelog