[packages/java-commons-validator] Up to 1.7

[arekm]

commit e1d184bcdfb7b60cd55c92427faf2a278ed72066
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 20:21:05 2026 +0200

    Up to 1.7

 java-commons-validator.spec | 68 +++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 39 deletions(-)
---
diff --git a/java-commons-validator.spec b/java-commons-validator.spec
index c116d92..ea29b4f 100644
--- a/java-commons-validator.spec
+++ b/java-commons-validator.spec
@@ -1,25 +1,28 @@
+%{?use_default_jdk:%use_default_jdk 8}
+
+%define		srcname	commons-validator
 Summary:	commons-validator - framework to define validators
 Summary(pl.UTF-8):	commons-validator - szkielet do definiowania metod kontrolujących poprawność
 Name:		java-commons-validator
-Version:	1.2.0
-Release:	2
+Version:	1.7
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://www.apache.org/dist/commons/validator/source/commons-validator-%{version}-src.tar.gz
-# Source0-md5:	984074a3707c4a366f0b08db88d41e4d
-URL:		http://commons.apache.org/validator/
-BuildRequires:	ant >= 1.5
+Source0:	https://archive.apache.org/dist/commons/validator/source/commons-validator-%{version}-src.tar.gz
+# Source0-md5:	933da2c22c3e7a86b5f02896d6558ae1
+URL:		https://commons.apache.org/validator/
 BuildRequires:	java-commons-beanutils
 BuildRequires:	java-commons-collections
 BuildRequires:	java-commons-digester
 BuildRequires:	java-commons-logging
-BuildRequires:	java-oro
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
+Requires:	java-commons-beanutils
+Requires:	java-commons-collections
 Requires:	java-commons-digester
-Requires:	java-oro
-Obsoletes:	jakarta-commons-validator
+Requires:	java-commons-logging
+Obsoletes:	jakarta-commons-validator < 1.7
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,43 +51,30 @@ Documentation for %{name}.
 Dokumentacja online do %{name}.
 
 %prep
-%setup -q -n commons-validator-%{version}
+%setup -q -n commons-validator-%{version}-src
 
 %build
-required_jars="commons-beanutils-core commons-collections commons-digester commons-logging oro"
-export CLASSPATH=$(%{_bindir}/build-classpath $required_jars)
-%ant dist
+required_jars="commons-beanutils commons-collections commons-digester commons-logging"
+CLASSPATH=$(%{_bindir}/build-classpath $required_jars)
+install -d target/classes
+%javac -d target/classes \
+	-source 1.7 -target 1.7 \
+	-classpath "$CLASSPATH" \
+	$(find src/main/java -name '*.java')
+cp -a src/main/resources/* target/classes/
+%jar cf target/%{srcname}-%{version}.jar -C target/classes .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-for a in dist/*.jar; do
-	jar=${a##*/}
-	cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
-	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
-done
-
-# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a target/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
-
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt
-%{_javadir}/*.jar
-
-%files javadoc
-%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt RELEASE-NOTES.txt
+%{_javadir}/%{srcname}.jar
+%{_javadir}/%{srcname}-%{version}.jar
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-commons-validator.git/commitdiff/e1d184bcdfb7b60cd55c92427faf2a278ed72066