packages: java-bcel/java-bcel.spec, java-bcel/java-bcel-noproxy.patch (NEW)...

[qboosh]

Author: qboosh                       Date: Thu Feb 10 17:35:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 5.2
- removed obsolete build,jdk15 patches, added noproxy patch

---- Files affected:
packages/java-bcel:
   java-bcel.spec (1.18 -> 1.19) , java-bcel-noproxy.patch (NONE -> 1.1)  (NEW), jakarta-bcel-build.patch (1.1 -> NONE)  (REMOVED), jakarta-bcel-jdk15.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/java-bcel/java-bcel.spec
diff -u packages/java-bcel/java-bcel.spec:1.18 packages/java-bcel/java-bcel.spec:1.19
--- packages/java-bcel/java-bcel.spec:1.18	Sun Apr 18 15:50:44 2010
+++ packages/java-bcel/java-bcel.spec	Thu Feb 10 18:35:30 2011
@@ -9,25 +9,23 @@
 Summary:	Byte Code Engineering Library
 Summary(pl.UTF-8):	Biblioteka do obróbki bajtkodu Javy
 Name:		java-bcel
-Version:	5.1
-Release:	2
+Version:	5.2
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-# a lot of junk (all other formats) inside -src.tar.gz, use -src.zip
-Source0:	http://www.apache.org/dist/jakarta/bcel/source/%{srcname}-%{version}-src.zip
-# Source0-md5:	23767d4e735543c25b950ab86c8f56b1
-Patch0:		jakarta-%{srcname}-build.patch
-Patch1:		jakarta-%{srcname}-manifest.patch
-Patch2:		jakarta-%{srcname}-jdk15.patch
+Source0:	http://www.apache.org/dist/jakarta/bcel/source/%{srcname}-%{version}-src.tar.gz
+# Source0-md5:	905b7e718e30e7ca726530ecf106e532
+Patch0:		jakarta-%{srcname}-manifest.patch
+Patch1:		%{name}-noproxy.patch
 URL:		http://jakarta.apache.org/bcel/
 BuildRequires:	ant
-BuildRequires:	java-regexp
+BuildRequires:	java-regexp >= 1.2
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
-Requires:	java-regexp
+Requires:	java-regexp >= 1.2
 Provides:	jakarta-bcel
 Obsoletes:	jakarta-bcel
 BuildArch:	noarch
@@ -83,7 +81,6 @@
 %setup -q -n bcel-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 find -name '*.jar' | xargs rm -f
 
 %build
@@ -91,18 +88,19 @@
 export JAVA_HOME="%{java_home}"
 export LC_ALL=en_US
 
-%ant jar %{?with_javadoc:apidocs}
+%ant jar %{?with_javadoc:javadoc} \
+	-Dnoget=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-cp -p bin/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -p target/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 %if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -R dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
@@ -115,7 +113,8 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt
-%{_javadir}/*.jar
+%{_javadir}/bcel-%{version}.jar
+%{_javadir}/bcel.jar
 
 %if %{with javadoc}
 %files javadoc
@@ -131,6 +130,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/02/10 17:35:30  qboosh
+- updated to 5.2
+- removed obsolete build,jdk15 patches, added noproxy patch
+
 Revision 1.18  2010/04/18 13:50:44  pawelz
 - don't force gcj for th
 - typo in G:

================================================================
Index: packages/java-bcel/java-bcel-noproxy.patch
diff -u /dev/null packages/java-bcel/java-bcel-noproxy.patch:1.1
--- /dev/null	Thu Feb 10 18:35:35 2011
+++ packages/java-bcel/java-bcel-noproxy.patch	Thu Feb 10 18:35:30 2011
@@ -0,0 +1,11 @@
+--- bcel-5.2/build.xml.orig	2006-06-03 05:48:22.000000000 +0200
++++ bcel-5.2/build.xml	2011-02-10 17:54:21.404692227 +0100
+@@ -110,8 +110,6 @@
+   <target name="get-deps" unless="noget" depends="init">
+     <!--Proxy settings works only with a JDK 1.2 and higher.-->
+ 
+-    <setproxy>
+-    </setproxy>
+     <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar">
+     </get>
+   </target>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-bcel/java-bcel.spec?r1=1.18&r2=1.19&f=u