[apache-commons-dbcp/f17] Added missing patch
by Deepak Bhole
commit 7f3ca70f8d84c2c6dd133cce7a3a8935216774c3
Author: Deepak Bhole <dbhole(a)redhat.com>
Date: Tue Mar 6 16:09:02 2012 -0500
Added missing patch
jdbc41.patch | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 440 insertions(+), 0 deletions(-)
---
diff --git a/jdbc41.patch b/jdbc41.patch
new file mode 100644
index 0000000..446ad44
--- /dev/null
+++ b/jdbc41.patch
@@ -0,0 +1,440 @@
+diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java
+--- src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100
+@@ -24,10 +24,12 @@
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.Collections;
++import java.util.logging.Logger;
+ import java.sql.Connection;
+ import java.sql.Driver;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
+
+ import org.apache.commons.pool.KeyedObjectPoolFactory;
+@@ -1579,4 +1581,10 @@
+ logWriter.println(message);
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
+--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100
++++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100
+@@ -19,10 +19,12 @@
+
+ import java.util.Hashtable;
+ import java.util.Properties;
++import java.util.logging.Logger;
+ import java.io.PrintWriter;
+ import java.io.Serializable;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.PooledConnection;
+ import javax.sql.ConnectionPoolDataSource;
+ import javax.naming.Name;
+@@ -719,4 +721,10 @@
+ {
+ _maxPreparedStatements = maxPreparedStatements;
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
+--- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100
+@@ -21,10 +21,12 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+@@ -561,4 +563,10 @@
+ CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
+ return mgr == null ? null : (GenericObjectPool) mgr.getPool();
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
+--- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100
+@@ -21,6 +21,8 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+@@ -269,5 +271,11 @@
+ throw new IOException("NamingException: " + e);
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+
+diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100
+@@ -37,6 +37,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link CallableStatement}.
+@@ -661,4 +662,14 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java
+--- src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100
+@@ -27,6 +27,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
++import java.util.concurrent.Executor;
+ import java.sql.ResultSet;
+ /* JDBC_4_ANT_KEY_BEGIN */
+ import java.sql.Array;
+@@ -40,6 +41,7 @@
+ import java.util.Collections;
+ import java.util.Properties;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link Connection}.
+@@ -678,5 +680,31 @@
+ return null;
+ }
+ }
+-/* JDBC_4_ANT_KEY_END */
++ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public String getSchema() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
++
+diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
+--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100
+@@ -24,6 +24,7 @@
+ import java.sql.RowIdLifetime;
+ /* JDBC_4_ANT_KEY_END */
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link DatabaseMetaData}.
+@@ -1208,4 +1209,13 @@
+
+ /* JDBC_4_ANT_KEY_END */
+
++ /* This functionality is not implemented yet */
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100
+@@ -34,6 +34,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link PreparedStatement}.
+@@ -402,4 +403,15 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
+--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100
+@@ -40,6 +40,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link ResultSet}.
+@@ -1079,4 +1080,14 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100
+@@ -22,6 +22,7 @@
+ import java.sql.SQLException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ /**
+@@ -386,4 +387,15 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
+--- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100
+@@ -21,6 +21,7 @@
+ import java.sql.Connection;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+@@ -123,4 +124,13 @@
+ super.passivate();
+ }
+
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
+--- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100
+@@ -21,6 +21,7 @@
+ import java.sql.PreparedStatement;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+@@ -137,4 +138,14 @@
+ super.passivate();
+ }
+
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java
+--- src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100
+@@ -21,8 +21,10 @@
+ import java.sql.Connection;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+
+ import java.util.NoSuchElementException;
++import java.util.concurrent.Executor;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+ import org.apache.commons.pool.KeyedPoolableObjectFactory;
+@@ -455,4 +457,30 @@
+ return buf.toString();
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public String getSchema() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
++
+diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java
+--- src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100
+@@ -23,10 +23,12 @@
+ import java.sql.DatabaseMetaData;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+
+ import javax.sql.DataSource;
+
+@@ -437,4 +439,9 @@
+ }
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java
+--- src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100
+@@ -27,6 +27,7 @@
+ import java.sql.DriverPropertyInfo;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.HashMap;
+@@ -34,6 +35,7 @@
+ import java.util.NoSuchElementException;
+ import java.util.Properties;
+ import java.util.Set;
++import java.util.logging.Logger;
+
+ import org.apache.commons.jocl.JOCLContentHandler;
+ import org.apache.commons.pool.ObjectPool;
+@@ -496,4 +498,10 @@
+ }
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
12 years, 1 month
[apache-commons-dbcp/f17] Resolves: 796638 Make buildable with Java 7/JDBC 4.1
by Deepak Bhole
commit 189cf8b1be7ac14174cf7eee311adffd496db89d
Author: Deepak Bhole <dbhole(a)redhat.com>
Date: Tue Mar 6 15:53:25 2012 -0500
Resolves: 796638
Make buildable with Java 7/JDBC 4.1
apache-commons-dbcp.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec
index 09d7e1a..c4ce0a4 100644
--- a/apache-commons-dbcp.spec
+++ b/apache-commons-dbcp.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Apache Commons DataBase Pooling Package
Group: Development/Libraries
License: ASL 2.0
@@ -13,9 +13,10 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short
# Depmap needed to remove tomcat* deps (needed only for testing)
# and fix geronimo transaction
Source1: %{short_name}.depmap
+Patch0: jdbc41.patch
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
BuildRequires: apache-commons-pool
@@ -24,7 +25,7 @@ BuildRequires: jta
BuildRequires: maven-plugin-cobertura
BuildRequires: maven
-Requires: java >= 1:1.6.0
+Requires: java
Requires: jpackage-utils
Requires: apache-commons-pool
@@ -61,6 +62,8 @@ This package contains the API documentation for %{name}.
%setup -q -n %{short_name}-%{version}-src
iconv -f iso8859-1 -t utf-8 RELEASE-NOTES.txt > RELEASE-NOTES.txt.conv && mv -f RELEASE-NOTES.txt.conv RELEASE-NOTES.txt
+%patch0
+
%build
# Skip tests, tomcat:naming-java and tomcat:naming-common not available
mvn-rpmbuild \
@@ -101,6 +104,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 23 2012 Pavel Tisnovsky <ptisnovs(a)redhat.com> - 1.4-9
+- Make this package independent of OpenJDK6 (it's buildable on OpenJDK7)
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month
[Bug 800144] New: Rebuilding maven-surefire from scratch not possible
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Rebuilding maven-surefire from scratch not possible
https://bugzilla.redhat.com/show_bug.cgi?id=800144
Summary: Rebuilding maven-surefire from scratch not possible
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven-surefire
AssignedTo: sochotni(a)redhat.com
ReportedBy: dwalluck(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Description of problem:
The actual patch line for 'Patch1: 0004-Surefire-2.12-bootstrap.patch' is
commented out. It is conditional on '%bootstrap' being true.
It should be unconditionally included in the src.rpm. Only the application of
the patch '%patch1' should be conditional.
Version-Release number of selected component (if applicable):
2.12-2
Actual results:
Patch is missing. Rebuilding from scratch is impossible.
Expected results:
Patch should be included in src.rpm.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month
[maven-surefire] Removing bootstrap condition for Patch1 inclusion (always needed in SRPM)
by Jaromír Cápík
commit 89077c171237de030b55559e1d635642aebe79ec
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Mar 6 19:39:32 2012 +0100
Removing bootstrap condition for Patch1 inclusion (always needed in SRPM)
maven-surefire.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 86d9a80..b8e1dac 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -2,7 +2,7 @@
Name: maven-surefire
Version: 2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -14,10 +14,7 @@ Source1: %{name}-jpp-depmap.xml
# provide compatibility for maven3
Patch0: 0003-Fix-maven3-compatibility.patch
-
-%if %{bootstrap}
Patch1: 0004-Surefire-2.12-bootstrap.patch
-%endif
BuildArch: noarch
BuildRequires: ant
@@ -371,6 +368,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Tue Mar 06 2012 Jaromir Capik <jcapik(a)redhat.com> - 0:2.12-3
+- Removing bootstrap condition for Patch1 inclusion (always needed in SRPM)
+
* Thu Mar 01 2012 Jaromir Capik <jcapik(a)redhat.com> - 0:2.12-2
- Update to 2.12
12 years, 1 month