rpms/apache-commons-fileupload/devel apache-commons-fileupload-remove-portlet.patch, NONE, 1.1 apache-commons-fileupload.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri May 21 07:30:03 UTC 2010

Author: sochotni

Update of /cvs/pkgs/rpms/apache-commons-fileupload/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11698/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apache-commons-fileupload-remove-portlet.patch 
	apache-commons-fileupload.spec import.log 
Log Message:
Initial import of apachec-commons-fileupload (rename of jakarta-commons-fileupload)



apache-commons-fileupload-remove-portlet.patch:
 pom.xml |   44 --------------------------------------------
 1 file changed, 44 deletions(-)

--- NEW FILE apache-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 &amp;copy; {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>


--- NEW FILE apache-commons-fileupload.spec ---

%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 <sochotnicky at redhat.com> - 1.2.1-3
- Added Requires on jpackage-utils for javadoc

* Thu May 20 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.2.1-2
- Rename package (jakarta-commons-fileupload->apache-commons-fileupload)
- Re-did whole spec file

* 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

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-8.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:1.0-7.3 
- drop repotag
- fix license tag

* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:1.0-7jpp.2
- Autorebuild for GCC 4.3

* Tue Apr 17 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0-6jpp.2
- Update spec file as per fedora review

* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-6jpp.1
- Added missing requirements.

* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0-5jpp_3fc
- Requires(post/postun): coreutils

* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0-5jpp_2fc
- Rebuilt

* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-5jpp_1fc
- Added conditional native compilation.

* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 1:1.0-4jpp
- First JPP 1.7 build

* Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> - 1:1.0-3jpp
- Patch to build with servletapi5
- Add missing dependency on ant-junit

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:1.0-2jpp
- Rebuild with ant-1.6.2

* Sat Jun 28 2003 Ville Skyttä <ville.skytta at iki.fi> - 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 <Nicolas.Mailhot (at) JPackage.org> - 1:1.0-0.beta1.4jpp
- for jpackage-utils 1.5

* Mon Mar 10 2003 Henri Gomez <hgomez at users.sourceforge.net> - 1:1.0-0.beta1.3jpp
- rebuild with correct ant (avoid corrupted archive)

* Fri Mar 07 2003 Henri Gomez <hgomez at users.sourceforge.net> - 1:1.0-0.beta1.2jpp
- replace servlet23 requirement by servlet4api

* Wed Feb 26 2003 Ville Skyttä <ville.skytta at iki.fi> - 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 <hgomez at users.sourceforge.net> 1.0-1jpp
- 1.0 (cvs 20030115)
- first jPackage release


--- NEW FILE import.log ---
apache-commons-fileupload-1_2_1-3_fc12:HEAD:apache-commons-fileupload-1.2.1-3.fc12.src.rpm:1274426591


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-fileupload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 May 2010 19:48:06 -0000	1.1
+++ .cvsignore	21 May 2010 07:30:02 -0000	1.2
@@ -0,0 +1 @@
+commons-fileupload-1.2.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-fileupload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 May 2010 19:48:06 -0000	1.1
+++ sources	21 May 2010 07:30:02 -0000	1.2
@@ -0,0 +1 @@
+c2bdb9264aec564e3f4fbbdf4344a844  commons-fileupload-1.2.1-src.tar.gz

