diff --git a/apache-commons-validator.changes b/apache-commons-validator.changes index 4b88c13..b345cb5 100644 --- a/apache-commons-validator.changes +++ b/apache-commons-validator.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 21 13:56:05 UTC 2018 - Fridrich Strba + +- Update to 1.5.0 +- Install the maven pom file + ------------------------------------------------------------------- Tue May 15 13:22:32 UTC 2018 - fstrba@suse.com diff --git a/apache-commons-validator.spec b/apache-commons-validator.spec index 1c17ee8..28d0594 100644 --- a/apache-commons-validator.spec +++ b/apache-commons-validator.spec @@ -23,10 +23,11 @@ Release: 0 Summary: Apache Commons Validator License: Apache-2.0 Group: Development/Libraries/Java -Url: http://commons.apache.org/commons/ +URL: http://commons.apache.org/commons/ Source0: http://archive.apache.org/dist/commons/validator/source/%{short_name}-%{version}-src.tar.gz Patch0: commons-validator-1.5.0-srcencoding.patch Patch1: commons-validator-1.5.0-digester.patch +Patch2: commons-validator-1.5.0-locale.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-commons-beanutils @@ -35,6 +36,7 @@ BuildRequires: apache-commons-logging BuildRequires: fdupes BuildRequires: jakarta-commons-digester BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: junit BuildRequires: oro Requires: apache-commons-beanutils >= 1.5 @@ -82,6 +84,7 @@ Validator Package. %setup -q -n %{short_name}-%{version}-src %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i 's/\r//' LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt @@ -104,7 +107,6 @@ ant \ -Dskip.download=true -Dbuild.sysclasspath=first \ dist -%if 0 %check export CLASSPATH=$(build-classpath \ commons-collections \ @@ -118,7 +120,6 @@ ant -v \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ -Dskip.download=true -Dbuild.sysclasspath=first \ test -%endif %install # jars @@ -135,11 +136,12 @@ cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir}/%{name}/ %files -f .mfiles -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%license LICENSE.txt +%doc NOTICE.txt RELEASE-NOTES.txt %{_javadir}/%{short_name}.jar %files javadoc -%doc LICENSE.txt -%{_javadocdir}/%{name} +%license LICENSE.txt +%doc %{_javadocdir}/%{name} %changelog diff --git a/commons-validator-1.5.0-locale.patch b/commons-validator-1.5.0-locale.patch new file mode 100644 index 0000000..bd72a8c --- /dev/null +++ b/commons-validator-1.5.0-locale.patch @@ -0,0 +1,70 @@ +--- commons-validator-1.5.0-src/build.xml 2015-11-19 00:52:34.000000000 +0100 ++++ commons-validator-1.5.0-src/build.xml 2018-12-21 14:54:10.838397098 +0100 +@@ -109,6 +109,23 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -323,7 +340,7 @@ + + + +- + + +@@ -364,7 +381,25 @@ + + + ++ description="Run routines unit test cases" unless="isJava9"> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + ++ + + +