From ab24ab442618eca8891b86f7da92a859ffb84713 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Nov 27 2012 17:46:40 +0000 Subject: Remove icu4j dependency from pom.xml --- diff --git a/xom.spec b/xom.spec index 5fb5f08..333c7be 100644 --- a/xom.spec +++ b/xom.spec @@ -36,7 +36,7 @@ Summary: XML Pull Parser Name: xom Version: 1.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 License: LGPLv2 URL: http://www.xom.nu @@ -111,6 +111,16 @@ find . -name "*.jar" -exec rm -f {} \; # disable tests that require icu4j rm -f src/nu/xom/tests/{Encoding,Verifier}Test.java +cp %{SOURCE1} pom.xml +# fix xml stuff in pom +sed -i 's%%%' pom.xml +# remove it from pom.xml since it's not needed anymore +%pom_remove_dep com.ibm.icu:icu4j + + %build pushd lib ln -sf $(build-classpath junit) junit.jar @@ -159,7 +169,7 @@ install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{versio # POM install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar %clean @@ -188,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}-%{version}/xom-samples.jar %changelog +* Tue Nov 27 2012 Stanislav Ochotnicky - 0:1.0-11 +- Remove icu4j dependency from pom.xml + * Mon Oct 8 2012 Mikolaj Izdebski - 0:1.0-10 - Replace icu4j Normalizer with java.text.Normalizer from JDK