rpms/jakarta-commons-io/devel commons-parent-3.pom, NONE, 1.1 jakarta-commons-io-jpp-depmap.xml, NONE, 1.1 jakarta-commons-io-settings.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 jakarta-commons-io.spec, 1.1, 1.2 sources, 1.2, 1.3
Permaine Cheung (pcheung)
fedora-extras-commits at redhat.com
Tue Jan 22 19:02:01 UTC 2008
- Previous message (by thread): rpms/twitux/F-8 twitux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85487.evoconnectivity.patch, NONE, 1.1 openoffice.org.spec, 1.1401, 1.1402
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pcheung
Update of /cvs/extras/rpms/jakarta-commons-io/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352
Modified Files:
.cvsignore jakarta-commons-io.spec sources
Added Files:
commons-parent-3.pom jakarta-commons-io-jpp-depmap.xml
jakarta-commons-io-settings.xml
Log Message:
Merge with upstream
--- NEW FILE commons-parent-3.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>4</version>
</parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<packaging>pom</packaging>
<!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
<version>3</version>
<name>Jakarta Commons</name>
<url>http://jakarta.apache.org/commons/</url>
<inceptionYear>2001</inceptionYear>
<!-- We don't use Continuum yet -->
<!--
<ciManagement>
<system>continuum</system>
<notifiers>
<notifier>
<configuration>
<address>commons-dev at jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
-->
<distributionManagement>
<!--
This POM's parent POM (the Apache root POM) provides repositories. Unfortunately,
this allows for accidental deployments. So we disable them here by providing
a dummy repository. Use "mvn -Prc deploy" (Apache snapshot repository) or
"mvn -Prelease deploy" (Apache release repository), if you really want to deploy.
-->
<repository>
<id>dummy</id>
<name>Dummy to avoid accidental deploys</name>
<url />
</repository>
</distributionManagement>
<!--
This section *must* be overwritten by subprojects. It is only to allow
a release of the commons-parent POM.
-->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/tags/commons-parent-3</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/tags/commons-parent-3</developerConnection>
<url>http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/tags/commons-parent-3</url>
</scm>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
<post>commons-dev at jakarta.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/commons-dev@jakarta.apache.org/</otherArchive>
<otherArchive>http://www.nabble.com/Commons---Dev-f317.html</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
<post>commons-user at jakarta.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/commons-user@jakarta.apache.org/</otherArchive>
<otherArchive>http://www.nabble.com/Commons---User-f319.html</otherArchive>
</otherArchives>
</mailingList>
</mailingLists>
<build>
<resources>
<resource>
<directory>${basedir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
<include>LICENSE.txt</include>
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.0-alpha-3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.3</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- TODO: later use toolchain support to do compilation on an external JDK 1.3+ compiler -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<!--
<Specification-Title>${project.name}</Specification-Title>
<Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-->
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${maven.compile.source}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<jdkLevel>${maven.compile.source}</jdkLevel>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<!-- Exclude the navigation file for Maven 1 sites
and the changes file used by the changes-plugin,
as they interfere with the site generation. -->
<moduleExcludes>
<xdoc>navigation.xml,changes.xml</xdoc>
</moduleExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
<version>2.0-beta-1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>release</id>
<distributionManagement>
<repository>
<id>apache.releases</id>
<name>Apache Release Distribution Repository</name>
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
</repository>
</distributionManagement>
<build>
<plugins>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>create-source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>create-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<source>${maven.compile.source}</source>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>rc</id>
<distributionManagement>
<repository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
</repository>
<snapshotRepository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>create-source-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>create-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<source>${maven.compile.source}</source>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<properties>
<!-- Default configuration for compiler source and target JVM -->
<maven.compile.source>1.3</maven.compile.source>
<maven.compile.target>1.3</maven.compile.target>
<!--
Make the deployment protocol pluggable. This allows to switch to
other protocols like scpexe, which some users prefer over scp.
-->
<commons.deployment.protocol>scp</commons.deployment.protocol>
</properties>
</project>
--- NEW FILE jakarta-commons-io-jpp-depmap.xml ---
<dependencies>
</dependencies>
--- NEW FILE jakarta-commons-io-settings.xml ---
<settings>
<profiles>
<profile>
<id>JPP</id>
<repositories>
<repository>
<id>internal</id>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</repository>
<repository>
<id>external</id>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</repository>
<repository>
<id>local</id>
<layout>jpp</layout>
<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>plugins-internal</id>
<name>plugins-internal</name>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-external</id>
<name>plugins-external</name>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-maven</id>
<name>plugins-maven</name>
<layout>jpp</layout>
<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>JPP</activeProfile>
</activeProfiles>
</settings>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-io/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 6 Mar 2007 20:00:11 -0000 1.2
+++ .cvsignore 22 Jan 2008 19:01:26 -0000 1.3
@@ -1 +1 @@
-commons-io-1.2-src.tar.gz
+commons-io-1.3.2-src.tar.gz
Index: jakarta-commons-io.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-io/devel/jakarta-commons-io.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-io.spec 6 Mar 2007 20:00:11 -0000 1.1
+++ jakarta-commons-io.spec 22 Jan 2008 19:01:26 -0000 1.2
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,30 +28,56 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%define gcj_support 0
+
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven 0
+
%define base_name commons-io
Name: jakarta-commons-io
-Version: 1.2
-Release: 3jpp.1%{?dist}
+Version: 1.3.2
+Release: 1jpp.1%{?dist}
Epoch: 0
Summary: Utilities to assist with developing IO functionality
Group: Development/Libraries/Java
License: Apache Software License
URL: http://jakarta.apache.org/commons/io/
-# svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/io/tags/IO_1_2/ commons-io-1.2-src
-# tar czf commons-io-1.2-src.tar.gz commons-io-1.2-src
-Source0: commons-io-1.2-src.tar.gz
+Source0: http://archive.apache.org/dist/commons/io/source/commons-io-1.3.2-src.tar.gz
+Source1: %{name}-settings.xml
+Source2: %{name}-jpp-depmap.xml
+Source3: commons-parent-3.pom
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if ! %{gcj_support}
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.6
+%endif
+BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit >= 0:3.8.1
+%if %{with_maven}
+BuildRequires: maven2 >= 2.0.4-10jpp
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-surefire
+%endif
Requires: jpackage-utils
-Requires(postun): jpackage-utils
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
%description
Commons-IO contains utility classes, stream implementations,
@@ -69,43 +95,132 @@
%prep
%setup -q -n %{base_name}-%{version}-src
+cp %{SOURCE1} settings.xml
+mkdir -p .m2/repository/JPP/maven2/default_poms
+cp %{SOURCE3} .m2/repository/JPP/maven2/default_poms/org.apache.commons-commons-parent.pom
%build
+%if %{with_maven}
+sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
+sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
+
+mvn-jpp \
+ -e \
+ -s $(pwd)/settings.xml \
+ -Dmaven2.jpp.mode=true \
+ -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ install javadoc:javadoc
+%else
+
+export OPT_JAR_LIST="ant/ant-junit junit"
+export CLASSPATH=
+CLASSPATH=target/classes:target/test-classes:$CLASSPATH
ant -Dbuild.sysclasspath=only dist
+%endif
%install
rm -rf $RPM_BUILD_ROOT
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%if %{with_maven}
+install -pm 644 target/%{base_name}-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%else
install -Dpm 644 build/%{base_name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%endif
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{base_name}-%{version}.jar
ln -s %{base_name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
+%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{base_name}
+
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
+
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
unzip -q build/dist/%{base_name}-%{version}.zip %{base_name}-%{version}/docs/* \
-d $RPM_BUILD_ROOT%{_javadocdir}
mv $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}/docs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -r $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
+%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*.jar
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
-
%changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.3.2-1jpp.1
+- Merge with upstream
+
+* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.3.2-1jpp
+- Upgrade to 1.3.2
+- Build with maven2 by default
+- Add pom and depmap frag
+
+* Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-4jpp
+- Make Vendor, Distribution based on macro
+
+* Tue Feb 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-3jpp
+- Add gcj_support option
+
+
* Tue Feb 13 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3jpp.1.fc7
- Fix spec per Fedora guidelines.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-io/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 6 Mar 2007 20:00:11 -0000 1.2
+++ sources 22 Jan 2008 19:01:26 -0000 1.3
@@ -1 +1 @@
-d56086faed78f41fe5cc536914d4abf2 commons-io-1.2-src.tar.gz
+7c98f852e70d52d4d9c3d8057be518f8 commons-io-1.3.2-src.tar.gz
- Previous message (by thread): rpms/twitux/F-8 twitux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85487.evoconnectivity.patch, NONE, 1.1 openoffice.org.spec, 1.1401, 1.1402
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list