commit jakarta-commons-fileupload

13 Mar 2008

Hello community,

here is the log from the commit of package jakarta-commons-fileupload
checked in at Thu Mar 13 18:55:02 CET 2008.

--------

--- jakarta-commons-fileupload/jakarta-commons-fileupload.changes	2006-09-22 14:10:27.000000000 +0200
+++ /mounts/work_src_done/NOARCH/jakarta-commons-fileupload/jakarta-commons-fileupload.changes	2008-03-13 16:23:55.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 13 16:23:38 CET 2008 - mvyskocil@suse.cz
+
+- merged with jpackage 1.7
+- update to 1.1.1
+
+-------------------------------------------------------------------

Old:
----
  commons-fileupload-1.0-src.tar.gz
  jakarta-commons-fileupload-crosslink.patch
  jakarta-commons-fileupload-java14compat.patch
  jakarta-commons-fileupload-servletapi5.patch

New:
----
  commons-fileupload-1.1.1-src.tar.gz
  jakarta-commons-fileupload-1.1.1-servletapi5.patch
  jakarta-commons-fileupload-build_xml.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jakarta-commons-fileupload.spec ++++++
--- /var/tmp/diff_new_pack.n13845/_old	2008-03-13 18:54:57.000000000 +0100
+++ /var/tmp/diff_new_pack.n13845/_new	2008-03-13 18:54:57.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package jakarta-commons-fileupload (Version 1.0)
+# spec file for package jakarta-commons-fileupload (Version 1.1.1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,27 +11,43 @@
 # norootforbuild
 # icecream 0
 
-Name:           jakarta-commons-fileupload
-BuildRequires:  ant-junit jakarta-commons-beanutils java2-devel-packages servletapi5 servletapi5-javadoc xml-commons-apis
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define base_name       fileupload
 %define short_name      commons-%{base_name}
-%define name            jakarta-%{short_name}
-%define version         1.0
-%define release         3jpp
 %define section         free
-Version:        1.0
-Release:        25
+
+Name:           jakarta-commons-fileupload
+Version:        1.1.1
+Release:        1
 Summary:        Jakarta Commons FileUpload Package
-License:        Apache
 Group:          Development/Libraries/Java
-Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupl...
-Patch0:         %{name}-crosslink.patch
-Patch1:         %{name}-servletapi5.patch
-Patch2:         %{name}-java14compat.patch
-URL:            http://jakarta.apache.org/commons/fileupload/
-Requires:       servletapi5
-BuildArch:      noarch
+License:        The Apache Software License
+Url:            http://jakarta.apache.org/commons/fileupload/
+Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupl...
+Patch0:         %{name}-build_xml.patch
+Patch1:         %{name}-%{version}-servletapi5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  jakarta-commons-io
+BuildRequires:  jpackage-utils >= 1.6
+BuildRequires:  junit >= 3.8.1
+BuildRequires:  portlet-1.0-api
+BuildRequires:  servletapi5
+%if %defined suse_version
+BuildRequires:  unzip
+BuildRequires:  java-devel
+%endif
+%if %{gcj_support}
+BuildRequires:  java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+Requires:       servletapi5
+Requires:       jpackage-utils >= 1.6
 Provides:       %{short_name}
 Obsoletes:      %{short_name}
 
@@ -63,67 +79,91 @@
 
 %prep
 %setup -q -n %{short_name}-%{version}
-%patch0 -p0
-%patch1 -p0
-%patch2 
+%patch0 -b .build.xml
+%patch1 -p0 -b .servletapi5
 # -----------------------------------------------------------------------------
 
 %build
-export CLASSPATH="$(build-classpath servletapi5 junit \
-jakarta-commons-beanutils):$PWD/target/classes:$PWD/target/test-classes"
+export CLASSPATH="$(build-classpath commons-io junit portlet-1.0-api \
+    servletapi5):${PWD}/target/classes:${PWD}/target/test-classes"
 ant \
   -Dbuild.sysclasspath=only \
   -Dfinal.name=%{name}-%{version} \
   -Dservletapi.javadoc=%{_javadocdir}/servletapi5 \
+    -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 \
   dist
 # -----------------------------------------------------------------------------
 
 %install
+%{__rm} -rf $RPM_BUILD_ROOT
 # jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+%{__mkdir} -p $RPM_BUILD_ROOT%{_javadir}
+%{__cp} -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+(
+    cd $RPM_BUILD_ROOT%{_javadir} && \
+    for jar in *-%{version}*; do
+        %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
+    done
+)
+(
+    cd $RPM_BUILD_ROOT%{_javadir} && \
+    for jar in *-%{version}*; do
+        %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
+    done
+)
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# -----------------------------------------------------------------------------
+%{__mkdir} -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%{__cp} -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
+%if %{gcj_support}
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+        %{_bindir}/rebuild-gcj-db
 fi
+%endif
+%if %{gcj_support}
+
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+        %{_bindir}/rebuild-gcj-db
+fi
+%endif
 # -----------------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-# -----------------------------------------------------------------------------
+%doc %{_javadocdir}/%{name}
 
-%changelog -n jakarta-commons-fileupload
-* Fri Sep 22 2006 - skh@suse.de
+%changelog
+* Thu Mar 13 2008 mvyskocil@suse.cz
+- merged with jpackage 1.7
+- update to 1.1.1
+* Fri Sep 22 2006 skh@suse.de
 - don't use icecream
 - use target="1.4" for build with java 1.5
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Tue Oct 18 2005 - jsmeix@suse.de
+* Tue Oct 18 2005 jsmeix@suse.de
 - Current version 1.0 from JPackage.org
-* Thu Sep 29 2005 - dmueller@suse.de
+* Thu Sep 29 2005 dmueller@suse.de
 - add norootforbuild
-* Fri Sep 17 2004 - skh@suse.de
+* Fri Sep 17 2004 skh@suse.de
 - Fix prerequires of javadoc subpackage
-* Sun Sep 05 2004 - skh@suse.de
+* Sun Sep 05 2004 skh@suse.de
 - Initial package created with version 1.0 (JPackage 1.5)

++++++ commons-fileupload-1.0-src.tar.gz -> commons-fileupload-1.1.1-src.tar.gz ++++++
++++ 14839 lines of diff (skipped)

++++++ jakarta-commons-fileupload-1.1.1-servletapi5.patch ++++++
--- src/test/org/apache/commons/fileupload/MockHttpServletRequest.java.orig	2007-01-10 13:43:37.000000000 -0500
+++ src/test/org/apache/commons/fileupload/MockHttpServletRequest.java	2007-01-10 13:47:42.000000000 -0500
@@ -381,6 +381,14 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getLocalName()
+	 */
+	public String getLocalName()
+	{
+		return null;
+	}
+
+	/**
 	 * @see javax.servlet.ServletRequest#getServerPort()
 	 */
 	public int getServerPort()
@@ -389,6 +397,22 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getRemotePort()
+	 */
+	public int getRemotePort()
+	{
+		return 0;
+	}
+
+	/**
+	 * @see javax.servlet.ServletRequest#getLocalPort()
+	 */
+	public int getLocalPort()
+	{
+		return 0;
+	}
+
+	/**
 	 * @see javax.servlet.ServletRequest#getReader()
 	 */
 	public BufferedReader getReader() throws IOException
@@ -397,6 +421,14 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getLocalAddr()
+	 */
+	public String getLocalAddr()
+	{
+		return null;
+	}
+
+	/**
 	 * @see javax.servlet.ServletRequest#getRemoteAddr()
 	 */
 	public String getRemoteAddr()
++++++ jakarta-commons-fileupload-build_xml.patch ++++++
--- build.xml.sav	2006-06-08 10:14:30.000000000 +0200
+++ build.xml	2006-10-13 13:13:19.000000000 +0200
@@ -70,7 +70,7 @@
       </and>
     </condition>
   </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
+  <target name="compile" description="o Compile the code">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -167,7 +167,7 @@
       </fileset>
     </copy>
   </target>
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+  <target name="javadoc" description="o Generate javadoc">
     <mkdir dir="${javadocdir}">
     </mkdir>
     <tstamp>
@@ -183,6 +183,7 @@
         <path refid="build.classpath">
         </path>
       </classpath>
+      <link href="${servletapi.javadoc}" />
     </javadoc>
   </target>
   <target name="get-dep-commons-io.jar" description="o Download the dependency : commons-io.jar" unless="commons-io.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-io.jar">
@@ -254,4 +255,4 @@
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
\ No newline at end of file
+</project>

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit jakarta-commons-fileupload

root＠Hilbert.suse.de