SPECS: java-commons-fileupload.spec - Patch noget (do not download deps) - ...

[pawelz]

Author: pawelz                       Date: Sat Mar 14 23:51:45 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Patch noget (do not download deps)
- dropped R: jre
- added R: java-commons-io, servletapi >=2.3
- correct dir for javadoc

---- Files affected:
SPECS:
   java-commons-fileupload.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/java-commons-fileupload.spec
diff -u SPECS/java-commons-fileupload.spec:1.20 SPECS/java-commons-fileupload.spec:1.21
--- SPECS/java-commons-fileupload.spec:1.20	Fri Jan 23 18:29:08 2009
+++ SPECS/java-commons-fileupload.spec	Sun Mar 15 00:51:40 2009
@@ -1,15 +1,11 @@
 # $Revision$, $Date$
-# TODO
-# - make it not to download jar deps to ~/.maven:
-#      [get] To: $HOME/.maven/repository/commons-io/jars/commons-io-1.1.jar
-#      [get] To: $HOME/.maven/repository/javax.servlet/jars/servlet-api-2.3.jar
-#      [get] To: $HOME/.maven/repository/javax.portlet/jars/portlet-api-1.0.jar
-#      [get] To: $HOME/.maven/repository/junit/jars/junit-3.8.1.jar
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 
 %include	/usr/lib/rpm/macros.java
+
+%define		srcname commons-fileupload
 Summary:	Commons FileUpload component for Java servlets
 Summary(pl.UTF-8):	Komponent Commons FileUpload dla serwletów Javy
 Name:		java-commons-fileupload
@@ -19,6 +15,7 @@
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-%{version}-src.tar.gz
 # Source0-md5:	d003445638bc272512112ace08d63bbb
+Patch0:		%{name}-noget.patch
 URL:		http://commons.apache.org/fileupload/
 BuildRequires:	ant-junit >= 1.5
 BuildRequires:	java-commons-io
@@ -27,8 +24,9 @@
 BuildRequires:	junit >= 3.8.1
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	java-commons-io
 Requires:	jpackage-utils
-Requires:	jre
+Requires:	servletapi >= 2.3
 Provides:	jakarta-commons-fileupload
 Obsoletes:	jakarta-commons-fileupload
 BuildArch:	noarch
@@ -61,23 +59,16 @@
 
 %prep
 %setup -q -n commons-fileupload-%{version}
+%patch0 -p1
 
 %build
 required_jars="junit servlet commons-io"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 
-%if 0
-cat > build.properties <<EOF
-noget=1
-final.name=commons-fileupload-%{version}.jar
-build.sysclasspath=$CLASSPATH
-EOF
-%endif
-
 %ant dist \
-	-Dfinal.name=commons-fileupload-%{version} \
-	-Dnoget=1 \
+	-Dbuild.compiler=extJavac \
+	-Dfinal.name=commons-fileupload-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,16 +80,16 @@
 
 # javadoc
 %if %{with javadoc}
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
@@ -108,8 +99,8 @@
 %if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -118,6 +109,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/03/14 23:51:40  pawelz
+- Patch noget (do not download deps)
+- dropped R: jre
+- added R: java-commons-io, servletapi >=2.3
+- correct dir for javadoc
+
 Revision 1.20  2009/01/23 17:29:08  pawelz
 - ghost symlink for javadoc
 
================================================================

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