diff --git a/apache-commons-chain.changes b/apache-commons-chain.changes index 2cbfdd7..7064ebf 100644 --- a/apache-commons-chain.changes +++ b/apache-commons-chain.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba + +- Build against commons-digester >= 1.8 +- Removed patch: + * commons-chain-1.2-digester.patch + + not needed when building with commons-digester >= 1.8 + ------------------------------------------------------------------- Fri Dec 21 16:03:07 UTC 2018 - Fridrich Strba diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec index 6cf4a4e..0939d30 100644 --- a/apache-commons-chain.spec +++ b/apache-commons-chain.spec @@ -30,8 +30,6 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{sho Patch0: %{name}-%{version}-tests-servlet31.patch # javax.portlet 2.0 api support Patch1: %{name}-%{version}-portlet20.patch -# Fix build with older jakarta-commons-digester -Patch2: commons-chain-1.2-digester.patch # Do not fetch dependencies during the build Patch3: commons-chain-1.2-getdeps.patch # javax.servlet 4.0 api support @@ -41,7 +39,7 @@ BuildRequires: ant-junit BuildRequires: apache-commons-collections BuildRequires: apache-commons-parent BuildRequires: commons-beanutils -BuildRequires: commons-digester +BuildRequires: commons-digester >= 1.8 BuildRequires: commons-logging BuildRequires: fdupes BuildRequires: javapackages-local @@ -50,7 +48,7 @@ BuildRequires: portlet-1.0-api BuildRequires: tomcat-servlet-4.0-api Requires: apache-commons-parent Requires: commons-beanutils -Requires: commons-digester +Requires: commons-digester >= 1.8 Requires: commons-logging BuildArch: noarch @@ -90,7 +88,6 @@ sed -i 's/\r$//g;' *.txt %patch0 -p1 %patch1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 diff --git a/commons-chain-1.2-digester.patch b/commons-chain-1.2-digester.patch deleted file mode 100644 index 2fd5ac5..0000000 --- a/commons-chain-1.2-digester.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- commons-chain-1.2-src/src/java/org/apache/commons/chain/config/ConfigParser.java 2008-05-29 18:43:15.000000000 +0200 -+++ commons-chain-1.2-src/src/java/org/apache/commons/chain/config/ConfigParser.java 2018-12-21 16:03:07.675014800 +0100 -@@ -17,6 +17,7 @@ - package org.apache.commons.chain.config; - - -+import java.net.URISyntaxException; - import java.net.URL; - import org.apache.commons.chain.Catalog; - import org.apache.commons.digester.Digester; -@@ -164,7 +164,11 @@ - digester.push(catalog); - - // Parse the configuration document -- digester.parse(url); -+ try { -+ digester.parse(url.toURI().toString()); -+ } catch (URISyntaxException e) { -+ throw new Exception(e); -+ } - - } - -@@ -187,7 +191,11 @@ - digester.clear(); - - // Parse the configuration document -- digester.parse(url); -+ try { -+ digester.parse(url.toURI().toString()); -+ } catch (URISyntaxException e) { -+ throw new Exception(e); -+ } - - } -