SPECS: jakarta-commons-fileupload.spec - unify java package (there...

[glen]

Author: glen                         Date: Wed Apr 11 17:00:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package (there's template-java.spec now)
- add todo (i failed)

---- Files affected:
SPECS:
   jakarta-commons-fileupload.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-fileupload.spec
diff -u SPECS/jakarta-commons-fileupload.spec:1.13 SPECS/jakarta-commons-fileupload.spec:1.14
--- SPECS/jakarta-commons-fileupload.spec:1.13	Wed Apr 11 17:50:04 2007
+++ SPECS/jakarta-commons-fileupload.spec	Wed Apr 11 19:00:14 2007
@@ -1,4 +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
+
 Summary:	Jakarta Commons FileUpload component for Java servlets
 Summary(pl.UTF-8):	Komponent Jakarta Commons FileUpload dla serwletów Javy
 Name:		jakarta-commons-fileupload
@@ -14,6 +21,7 @@
 BuildRequires:	jakarta-servletapi >= 2.3
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8.1
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,45 +36,69 @@
 dodawania funkcjonalności uploadu wieloczęściowych plików do serwletów
 i aplikacji WWW.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons FileUpload documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons FileUpload
-Group:		Development/Languages/Java
+Group:		Documentation
+Requires:	jpackage-utils
+Obsoletes:	jakarta-commons-fileupload-doc
 
-%description doc
+%description javadoc
 Jakarta Commons FileUpload documentation.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons FileUpload.
 
 %prep
 %setup -q -n commons-fileupload-%{version}
 
 %build
-export JAVA_HOME="%{java_home}"
-# for tests
-export CLASSPATH="`build-classpath servlet junit commons-io`"
-ant dist \
-	-Dnoget=1
+required_jars="junit servlet commons-io"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%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 \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf commons-fileupload-1.2-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/commons-fileupload.jar
+# install jars
+cp -a dist/commons-fileupload-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s commons-fileupload-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-fileupload.jar
+
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+	rm -f %{_javadocdir}/%{name}
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc dist/*.txt
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc dist/docs
+%{_javadocdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -74,6 +106,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/04/11 17:00:14  glen
+- unify java package (there's template-java.spec now)
+- add todo (i failed)
+
 Revision 1.13  2007/04/11 15:50:04  baggins
 - rel 3
 - updated BRs
@@ -91,8 +127,8 @@
 - updated for jpackage-utils
 
 Revision 1.8  2006/07/24 18:47:11  czarny
- - up to 1.1.1
- - BR: ant(junit) -> ant-junit
+- up to 1.1.1
+- BR: ant(junit) -> ant-junit
 
 Revision 1.7  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-fileupload.spec?r1=1.13&r2=1.14&f=u