rpms/jakarta-commons-pool/devel commons-pool-1.3.pom, NONE, 1.1 jakarta-commons-pool.spec, 1.26, 1.27
mef
mef at fedoraproject.org
Fri Dec 11 16:03:53 UTC 2009
Author: mef
Update of /cvs/pkgs/rpms/jakarta-commons-pool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860/devel
Modified Files:
jakarta-commons-pool.spec
Added Files:
commons-pool-1.3.pom
Log Message:
* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
- Include Maven metadata
- Fix badly auto-incremented release version
--- NEW FILE commons-pool-1.3.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<name>Commons Pool</name>
<version>1.3</version>
<description>Commons Object Pooling Library</description>
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
<issueManagement>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev at jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</inceptionYear>
<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>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
</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>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>morgand</id>
<name>Morgan Delagrange</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>geirm</id>
<name>Geir Magnusson</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>rwaldhoff</id>
<name>Rodney Waldhoff</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>dweinr1</id>
<name>David Weinrich</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>dirkv</id>
<name>Dirk Verbeeck</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>rdonkin</id>
<name>Robert Burrell Donkin</name>
<email></email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>sandymac</id>
<name>Sandy McArthur</name>
<email></email>
<organization>Apache Software Foundation</organization>
</developer>
</developers>
<contributors>
<contributor>
<name>Todd Carmichael</name>
<email>toddc at concur.com</email>
</contributor>
</contributors>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<targetPath>META-INF</targetPath>
<directory>${basedir}</directory>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>org/apache/commons/pool/Test*Factory.java</include>
<include>org/apache/commons/pool/TestBaseObjectPool.java</include>
<include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
<include>org/apache/commons/pool/TestPoolUtils.java</include>
<include>org/apache/commons/pool/impl/Test*Pool.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>1.7</version>
<configuration>
<comment><strong>Site Only</strong> - v1.7 (minimum)</comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
<version>1.5</version>
<configuration>
<comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jdiff-plugin</artifactId>
<version>1.5</version>
<configuration>
<comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
<version>1.6</version>
<configuration>
<comment><strong>Site Only</strong> - v1.6 (minimum)</comment>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>
Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- jakarta-commons-pool.spec 25 Jul 2009 03:51:59 -0000 1.26
+++ jakarta-commons-pool.spec 11 Dec 2009 16:03:53 -0000 1.27
@@ -45,7 +45,7 @@
Name: jakarta-commons-pool
Version: 1.3
-Release: 12.5%{?dist}
+Release: 13%{?dist}
Epoch: 0
Summary: Jakarta Commons Pool Package
License: ASL 2.0
@@ -59,6 +59,7 @@ Source5: commons-build.tar.gz
# svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
# tar czf commons-build.tar.gz commons-build
Source6: pool-tomcat5-build.xml
+Source7: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Patch0: jakarta-commons-pool-build.patch
Url: http://jakarta.apache.org/commons/%{base_name}/
@@ -95,6 +96,9 @@ Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
%description
The goal of Pool package it to create and maintain an object
(instance) pooling package to be distributed under the ASF license.
@@ -140,6 +144,7 @@ find . -name "*.jar" -exec rm -f {} \;
gzip -dc %{SOURCE5} | tar xf -
%patch0
cp %{SOURCE6} .
+cp %{SOURCE7} .
%build
mkdir ./tmp
@@ -193,6 +198,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docd
cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%endif
+# Add Maven information
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 %{short_name}-%{version}.pom $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
+
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
@@ -200,16 +210,18 @@ cp -pr target/docs/* $RPM_BUILD_ROOT%{_d
%clean
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
@@ -240,6 +252,8 @@ fi
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
%if %{gcj_support}
%attr(-,root,root)
@@ -269,6 +283,10 @@ fi
%endif
%changelog
+* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
+- Include Maven metadata
+- Fix badly auto-incremented release version
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3-12.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list