rpms/jakarta-commons-fileupload/F-12 jakarta-commons-fileupload-remove-portlet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jakarta-commons-fileupload.spec, 1.27, 1.28 sources, 1.3, 1.4
mef
mef at fedoraproject.org
Wed Jan 6 15:00:27 UTC 2010
- Previous message (by thread): rpms/flute/devel flute.spec,1.6,1.7
- Next message (by thread): rpms/jakarta-commons-fileupload/devel jakarta-commons-fileupload-remove-portlet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jakarta-commons-fileupload.spec, 1.27, 1.28 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mef
Update of /cvs/pkgs/rpms/jakarta-commons-fileupload/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29512/F-12
Modified Files:
.cvsignore jakarta-commons-fileupload.spec sources
Added Files:
jakarta-commons-fileupload-remove-portlet.patch
Log Message:
Update to new upstream version; add Maven metadata
jakarta-commons-fileupload-remove-portlet.patch:
pom.xml | 44 --------------------------------------------
1 file changed, 44 deletions(-)
--- NEW FILE jakarta-commons-fileupload-remove-portlet.patch ---
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 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <!--
- Configure OSGi bundle information
- (remove when maven bundle plugin is added to commons-parent pom)
- -->
- <manifestEntries>
- <Bundle-SymbolicName>org.apache.commons.fileupload</Bundle-SymbolicName>
- <Bundle-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Bundle-License>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
- <Bundle-Name>Apache Commons FileUpload Bundle</Bundle-Name>
- <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
-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}
- </Export-Package>
- <Import-Package>
-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
- </Import-Package>
- <DynamicImport-Package>javax.portlet</DynamicImport-Package>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</bottom>
@@ -216,12 +178,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-fileupload/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 26 Apr 2007 15:16:31 -0000 1.4
+++ .cvsignore 6 Jan 2010 15:00:27 -0000 1.5
@@ -1 +1 @@
-commons-fileupload-1.0-src.tar.gz
+commons-fileupload-1.2.1-src.tar.gz
Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-fileupload/F-12/jakarta-commons-fileupload.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- jakarta-commons-fileupload.spec 25 Jul 2009 03:49:59 -0000 1.27
+++ jakarta-commons-fileupload.spec 6 Jan 2010 15:00:27 -0000 1.28
@@ -36,27 +36,40 @@
%define short_name commons-%{base_name}
Name: jakarta-%{short_name}
-Version: 1.0
-Release: 9.3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: This package provides an api to work with html file upload
License: ASL 1.1
Group: Development/Libraries/Java
Epoch: 1
-Source0: commons-fileupload-1.0-src.tar.gz
-#svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/fileupload/tags/FILEUPLOAD_1_0/
-#mv FILEUPLOAD_1_0 commons-fileupload-1.0
-#tar czvf commons-fileupload-1.0-src.tar.gz commons-fileupload-1.0
-Patch0: %{name}-crosslink.patch
-Patch1: %{name}-servletapi5.patch
+Source0: http://apache.mirror.infiniteconflict.com/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
+
+# Portlets are not in Fedora yet
+Patch0: %{name}-remove-portlet.patch
+
URL: http://jakarta.apache.org/commons/fileupload/
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: ant
-BuildRequires: ant-junit
BuildRequires: junit >= 0:3.8.1
-BuildRequires: servlet24
-BuildRequires: servletapi5-javadoc
-Requires: servletapi5
-Requires: jpackage-utils
+BuildRequires: servlet_2_4_api
+BuildRequires: tomcat5
+BuildRequires: jakarta-commons-io
+BuildRequires: maven2
+BuildRequires: maven-plugin-bundle
+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
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-doxia-sitetools
+
+Requires: jpackage-utils
+Requires: jakarta-commons-io
+Requires: servlet24
+
%if ! %{gcj_support}
BuildArch: noarch
%endif
@@ -70,6 +83,9 @@ Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
%description
The javax.servlet package lacks support for rfc 1867, html file
upload. This package provides a simple to use api for working with
@@ -87,21 +103,22 @@ Javadoc for %{name}.
# -----------------------------------------------------------------------------
%prep
-%setup -q -n %{short_name}-%{version}
-%patch0 -p0
-%patch1 -p0
+%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 CLASSPATH="$(build-classpath servletapi5 junit \
-jakarta-commons-beanutils):$PWD/target/classes:$PWD/target/test-classes"
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
-ant \
- -Dbuild.sysclasspath=only \
- -Dfinal.name=%{name}-%{version} \
- -Dservletapi.javadoc=%{_javadocdir}/servletapi5 \
- dist
+mvn-jpp \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ install javadoc:javadoc
# -----------------------------------------------------------------------------
@@ -110,15 +127,21 @@ rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(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)
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $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%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
+
# -----------------------------------------------------------------------------
%if %{gcj_support}
@@ -130,16 +153,18 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
-%if %{gcj_support}
%post
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -148,8 +173,10 @@ fi
%files
%defattr(0644,root,root,0755)
-%doc LICENSE.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
@@ -164,6 +191,9 @@ fi
# -----------------------------------------------------------------------------
%changelog
+* Wed Jan 6 2010 Mary Ellen Foster <mefoster at gmail.com> - 1:1.2.1-1
+- Update to newest version; include Maven metadata
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-9.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-fileupload/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 26 Apr 2007 15:16:31 -0000 1.3
+++ sources 6 Jan 2010 15:00:27 -0000 1.4
@@ -1 +1 @@
-18041bec90fe9d8c070f59afaab2b9a4 commons-fileupload-1.0-src.tar.gz
+c2bdb9264aec564e3f4fbbdf4344a844 commons-fileupload-1.2.1-src.tar.gz
- Previous message (by thread): rpms/flute/devel flute.spec,1.6,1.7
- Next message (by thread): rpms/jakarta-commons-fileupload/devel jakarta-commons-fileupload-remove-portlet.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jakarta-commons-fileupload.spec, 1.27, 1.28 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list