commit 4f5d4e726819489aece5906e9d61bda962274fb4
Author: Jan Rękorajski <[email protected]>
Date: Tue Feb 28 20:03:48 2017 +0100
- replace java16 patch with java7 patch from gentoo
- updated BRs
- rel 2
java-avalon-logkit-java16.patch | 30 ------------------------------
java-avalon-logkit-java7.patch | 30 ++++++++++++++++++++++++++++++
java-avalon-logkit.spec | 5 +++--
3 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/java-avalon-logkit.spec b/java-avalon-logkit.spec
index 99b783a..846003f 100644
--- a/java-avalon-logkit.spec
+++ b/java-avalon-logkit.spec
@@ -8,14 +8,15 @@ Summary: Java logging toolkit
Summary(pl.UTF-8): Biblioteka do logowania w Javie
Name: java-avalon-logkit
Version: 2.1
-Release: 1
+Release: 2
License: Apache v2.0
Group: Libraries/Java
Source0:
http://www.apache.org/dist/excalibur/avalon-logkit/source/%{srcname}-%{version}-src.tar.gz
# Source0-md5: fee6f5f2db70c320aafbfb4cc32c1c43
-Patch0: %{name}-java16.patch
+Patch0: %{name}-java7.patch
URL: http://excalibur.apache.org/logger.html
BuildRequires: ant
+BuildRequires: ant-junit
%if %(locale -a | grep -q ^en_US$ ; echo $?)
BuildRequires: glibc-localedb-all
%endif
diff --git a/java-avalon-logkit-java16.patch b/java-avalon-logkit-java16.patch
deleted file mode 100644
index c976dee..0000000
--- a/java-avalon-logkit-java16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- LogKit-1.2.orig/src/java/org/apache/log/output/db/DefaultDataSource.java
2003-02-10 19:12:55.000000000 +0100
-+++ LogKit-1.2/src/java/org/apache/log/output/db/DefaultDataSource.java
2008-10-23 19:46:49.000000000 +0200
-@@ -149,4 +149,27 @@
- {
- m_logWriter = logWriter;
- }
-+
-+ /**
-+ * @param iface
-+ * @return
-+ * @throws SQLException
-+ * @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
-+ */
-+ public boolean isWrapperFor(Class iface) throws SQLException {
-+ throw new UnsupportedOperationException("This operation is not
supported because we need to stay compatible " +
-+ "with Java 1.4 where
isWrapperFor() is not defined");
-+ }
-+
-+ /**
-+ * @param iface
-+ * @return
-+ * @throws SQLException
-+ * @see java.sql.Wrapper#unwrap(java.lang.Class)
-+ */
-+ public Object unwrap(Class iface) throws SQLException {
-+ //I hope that nothing will call this method (GK)
-+ throw new UnsupportedOperationException("This operation is not
supported because we need to stay compatible " +
-+ "with Java 1.4 where
unwrap() is not defined");
-+ }
- }
diff --git a/java-avalon-logkit-java7.patch b/java-avalon-logkit-java7.patch
new file mode 100644
index 0000000..cb2611b
--- /dev/null
+++ b/java-avalon-logkit-java7.patch
@@ -0,0 +1,30 @@
+diff -Nur
avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java
avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
+--- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java
2005-08-30 05:03:49.000000000 +0300
++++
avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
2011-09-27 08:27:49.313005212 +0300
+@@ -20,7 +20,9 @@
+ import java.sql.Connection;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
++import java.util.logging.Logger;
+
+ /**
+ * A basic datasource that doesn't do any pooling but just wraps
+@@ -111,4 +113,16 @@
+ {
+ m_logWriter = logWriter;
+ }
++
++ public boolean isWrapperFor(Class cls) {
++ return false;
++ }
++
++ public Object unwrap(Class cls) throws SQLException {
++ throw new SQLException("Not a wrapper for " + cls);
++ }
++
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException("Not a supported feature");
++ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-avalon-logkit.git/commitdiff/4f5d4e726819489aece5906e9d61bda962274fb4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
