packages: java-commons-fileupload/java-commons-fileupload.spec - unified ja...

[pawelz]

Author: pawelz                       Date: Fri Aug 21 07:35:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified java deps and required jar names
- dropped export CLASSPATH. It is not needed since %ant macro passes CLASSPATH
  env variable to ant
- sorted BRs

---- Files affected:
packages/java-commons-fileupload:
   java-commons-fileupload.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/java-commons-fileupload/java-commons-fileupload.spec
diff -u packages/java-commons-fileupload/java-commons-fileupload.spec:1.31 packages/java-commons-fileupload/java-commons-fileupload.spec:1.32
--- packages/java-commons-fileupload/java-commons-fileupload.spec:1.31	Mon May 18 15:45:53 2009
+++ packages/java-commons-fileupload/java-commons-fileupload.spec	Fri Aug 21 09:35:30 2009
@@ -26,19 +26,19 @@
 Patch0:		%{name}-noget.patch
 URL:		http://commons.apache.org/fileupload/
 BuildRequires:	ant-junit >= 1.5
+BuildRequires:	java(Portlet) = 1.0
+BuildRequires:	java(Servlet) >= 2.4
 BuildRequires:	java-commons-io
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+BuildRequires:	java-junit >= 3.8.1
 %{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 3.8.1
-BuildRequires:	portletapi = 1.0
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	servletapi >= 2.4
+Requires:	java(Portlet) = 1.0
+Requires:	java(Servlet) >= 2.4
 Requires:	java-commons-io
 Requires:	jpackage-utils
-Requires:	portletapi = 1.0
-Requires:	servletapi >= 2.4
 Provides:	jakarta-commons-fileupload
 Obsoletes:	jakarta-commons-fileupload
 BuildArch:	noarch
@@ -74,9 +74,8 @@
 %patch0 -p1
 
 %build
-required_jars="junit portletapi10 servlet commons-io"
+required_jars="junit portlet-api-1.0 servlet-api commons-io"
 CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
 
 %ant jar \
 	-Dbuild.sysclasspath=first \
@@ -125,6 +124,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2009/08/21 07:35:30  pawelz
+- unified java deps and required jar names
+- dropped export CLASSPATH. It is not needed since %ant macro passes CLASSPATH
+  env variable to ant
+- sorted BRs
+
 Revision 1.31  2009/05/18 13:45:53  pawelz
 - conditional JDK bconds
 - drop -Dbuild.classpath (no longer needed)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-fileupload/java-commons-fileupload.spec?r1=1.31&r2=1.32&f=u