diff --git a/.cvsignore b/.cvsignore index e69de29..39fb17e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +commons-fileupload-1.2.1-src.tar.gz diff --git a/apache-commons-fileupload-remove-portlet.patch b/apache-commons-fileupload-remove-portlet.patch new file mode 100644 index 0000000..82b2599 --- /dev/null +++ b/apache-commons-fileupload-remove-portlet.patch @@ -0,0 +1,61 @@ +diff -ur commons-fileupload-1.2.1-src.orig/pom.xml commons-fileupload-1.2.1-src/pom.xml +--- commons-fileupload-1.2.1-src.orig/pom.xml 2009-11-23 14:02:56.527724643 +0000 ++++ commons-fileupload-1.2.1-src/pom.xml 2009-11-23 14:03:18.261662818 +0000 +@@ -147,44 +147,6 @@ + + + +- maven-jar-plugin +- +- +- +- +- org.apache.commons.fileupload +- http://www.apache.org/licenses/LICENSE-2.0.txt +- 2 +- Apache Commons FileUpload Bundle +- ${project.organization.name} +- ${project.version} +- +-org.apache.commons.fileupload;version=${project.version}, +-org.apache.commons.fileupload.disk;version=${project.version}, +-org.apache.commons.fileupload.portlet;version=${project.version}, +-org.apache.commons.fileupload.servlet;version=${project.version}, +-org.apache.commons.fileupload.util;version=${project.version} +- +- +-org.apache.commons.fileupload;version=${project.version}, +-org.apache.commons.fileupload.disk;version=${project.version}, +-org.apache.commons.fileupload.portlet;version=${project.version}, +-org.apache.commons.fileupload.servlet;version=${project.version}, +-org.apache.commons.fileupload.util;version=${project.version}, +-org.apache.commons.io, +-org.apache.commons.io.output, +-javax.servlet, +-javax.servlet.http +- +- javax.portlet +- +- +- +- +- + maven-javadoc-plugin + + Copyright &copy; {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. +@@ -216,12 +178,6 @@ + provided + + +- portlet-api +- portlet-api +- 1.0 +- provided +- +- + commons-io + commons-io + 1.3.2 diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec new file mode 100644 index 0000000..5eed7fe --- /dev/null +++ b/apache-commons-fileupload.spec @@ -0,0 +1,210 @@ + +%global base_name fileupload +%global short_name commons-%{base_name} + +Name: apache-%{short_name} +Version: 1.2.1 +Release: 3%{?dist} +Summary: This package provides an api to work with html file upload +License: ASL 1.1 +Group: Development/Libraries +URL: http://commons.apache.org/%{base_name}/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +BuildArch: noarch + +# Portlets are not in Fedora yet +Patch0: %{name}-remove-portlet.patch + +BuildRequires: junit >= 0:3.8.1 +BuildRequires: servlet_2_4_api +BuildRequires: tomcat5 +BuildRequires: apache-commons-io +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-bundle +BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-assembly +BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-idea +BuildRequires: maven2-plugin-install +BuildRequires: maven2-plugin-jar +BuildRequires: maven2-plugin-javadoc +BuildRequires: maven2-plugin-resources + +Requires: jpackage-utils +Requires: apache-commons-io +Requires: servlet24 +Requires(post): jpackage-utils +Requires(postun): jpackage-utils + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: jakarta-%{short_name} = 1:%{version}-%{release} +Obsoletes: jakarta-%{short_name} < 1:1.2.1-2 + +%description +The javax.servlet package lacks support for rfc 1867, html file +upload. This package provides a simple to use api for working with +such data. The scope of this package is to create a package of Java +utility classes to read multipart/form-data within a +javax.servlet.http.HttpServletRequest + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +Obsoletes: jakarta-%{short_name}-javadoc < 1:1.2.1-2 + +%description javadoc +%{summary}. + +# ----------------------------------------------------------------------------- + +%prep +%setup -q -n %{short_name}-%{version}-src + +# Remove portlet stuff +%patch0 -p1 +rm -rf src/java/org/apache/commons/fileupload/portlet +rm -f src/test/org/apache/commons/fileupload/*Portlet* + +# ----------------------------------------------------------------------------- + +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +mvn-jpp \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc + +# ----------------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT + +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +pushd $RPM_BUILD_ROOT%{_javadir} +for jar in *-%{version}*; do + ln -sf ${jar} `echo $jar| sed "s|apache-||g"` + ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` + ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"` +done +popd # come back from javadir + +# javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +# pom +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} + +# following line is only for backwards compatibility. New packages +# should use proper groupid org.apache.commons and also artifactid +%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} + +# ----------------------------------------------------------------------------- + +%clean +rm -rf $RPM_BUILD_ROOT + +# ----------------------------------------------------------------------------- + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt +%{_javadir}/* +%{_mavendepmapfragdir}/* +%{_mavenpomdir}/*.pom + +%files javadoc +%defattr(-,root,root,-) +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} + +# ----------------------------------------------------------------------------- + +%changelog +* Thu May 20 2010 Stanislav Ochotnicky - 1.2.1-3 +- Added Requires on jpackage-utils for javadoc + +* Thu May 20 2010 Stanislav Ochotnicky - 1.2.1-2 +- Rename package (jakarta-commons-fileupload->apache-commons-fileupload) +- Re-did whole spec file + +* Wed Jan 6 2010 Mary Ellen Foster - 1:1.2.1-1 +- Update to newest version; include Maven metadata + +* Fri Jul 24 2009 Fedora Release Engineering - 1:1.0-9.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1:1.0-8.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.0-7.3 +- drop repotag +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 1:1.0-7jpp.2 +- Autorebuild for GCC 4.3 + +* Tue Apr 17 2007 Permaine Cheung - 1:1.0-6jpp.2 +- Update spec file as per fedora review + +* Thu Aug 10 2006 Deepak Bhole - 1:1.0-6jpp.1 +- Added missing requirements. + +* Thu Aug 10 2006 Karsten Hopp 1.0-5jpp_3fc +- Requires(post/postun): coreutils + +* Sat Jul 22 2006 Jakub Jelinek - 1:1.0-5jpp_2fc +- Rebuilt + +* Thu Jul 20 2006 Deepak Bhole - 1:1.0-5jpp_1fc +- Added conditional native compilation. + +* Wed Apr 26 2006 Fernando Nasser - 1:1.0-4jpp +- First JPP 1.7 build + +* Fri Oct 22 2004 Fernando Nasser - 1:1.0-3jpp +- Patch to build with servletapi5 +- Add missing dependency on ant-junit + +* Sun Aug 23 2004 Randy Watler - 1:1.0-2jpp +- Rebuild with ant-1.6.2 + +* Sat Jun 28 2003 Ville Skyttä - 1:1.0-1jpp +- Update to 1.0. +- Add Epochs to dependencies. +- Nuke beanutils dependency. +- Versionless javadoc dir symlinks. + +* Tue Mar 25 2003 Nicolas Mailhot - 1:1.0-0.beta1.4jpp +- for jpackage-utils 1.5 + +* Mon Mar 10 2003 Henri Gomez - 1:1.0-0.beta1.3jpp +- rebuild with correct ant (avoid corrupted archive) + +* Fri Mar 07 2003 Henri Gomez - 1:1.0-0.beta1.2jpp +- replace servlet23 requirement by servlet4api + +* Wed Feb 26 2003 Ville Skyttä - 1:1.0-0.beta1.1jpp +- Update to 1.0 beta 1 (no code changes from cvs20030115). +- Fix requirements. + +* Wed Jan 15 2003 Henri Gomez 1.0-1jpp +- 1.0 (cvs 20030115) +- first jPackage release diff --git a/import.log b/import.log new file mode 100644 index 0000000..86fe2e0 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +apache-commons-fileupload-1_2_1-3_fc12:HEAD:apache-commons-fileupload-1.2.1-3.fc12.src.rpm:1274426591 diff --git a/sources b/sources index e69de29..b4d299c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c2bdb9264aec564e3f4fbbdf4344a844 commons-fileupload-1.2.1-src.tar.gz