[packages/java-classpathx_servlet] Rel 9

arekm arekm at pld-linux.org
Sat Apr 4 15:09:12 CEST 2026


commit ffaf2956bf7cab4d624823cfffa884fca40275a5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 15:09:05 2026 +0200

    Rel 9

 java-classpathx_servlet-javadoc-doclint.patch | 11 +++++++++++
 java-classpathx_servlet.spec                  | 13 +++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/java-classpathx_servlet.spec b/java-classpathx_servlet.spec
index 1b173ae..b89404a 100644
--- a/java-classpathx_servlet.spec
+++ b/java-classpathx_servlet.spec
@@ -3,22 +3,25 @@
 
 %bcond_without	javadoc		# don't build javadoc
 
+%{?use_default_jdk:%use_default_jdk 8}
+
 %define		srcname		classpathx_servlet
 Summary:	Alternative Servlet implementation
 Summary(pl.UTF-8):	Alternatywna implementacja Java Servlet API
 Name:		java-classpathx_servlet
 Version:	20000924
-Release:	8
+Release:	9
 License:	LGPL
 Group:		Libraries/Java
 Source0:	http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{version}.tar.gz
 # Source0-md5:	a81feddb91b1358f9aaed94e83eddb54
 Patch0:		%{name}-gjdoc.patch
+Patch1:		%{name}-javadoc-doclint.patch
 URL:		http://www.euronet.nl/~pauls/java/servlet/
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
 Provides:	servlet = 2.0
 Provides:	servlet = 2.1
 Provides:	servlet = 2.2
@@ -55,7 +58,9 @@ Javadoc pour classpathx servlet.
 %setup -q -n classpathx_servlet-%{version}
 
 find -name '*.jar' | xargs rm -v
-%{!?with_java_sun:%patch0 -p1}
+# gjdoc patch not needed with modern JDK
+#%%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 export JAVA_HOME="%{java_home}"
diff --git a/java-classpathx_servlet-javadoc-doclint.patch b/java-classpathx_servlet-javadoc-doclint.patch
new file mode 100644
index 0000000..1ab5002
--- /dev/null
+++ b/java-classpathx_servlet-javadoc-doclint.patch
@@ -0,0 +1,11 @@
+--- classpathx_servlet-20000924/apidoc/Makefile~	1999-05-30 15:46:04.000000000 +0200
++++ classpathx_servlet-20000924/apidoc/Makefile	2026-04-04 12:00:00.000000000 +0200
+@@ -1,7 +1,7 @@
+ all	: doc
+
+ doc	:
+-	javadoc -version -classpath ..:$(CLASSPATH) -d . \
++	javadoc -Xdoclint:none -version -classpath ..:$(CLASSPATH) -d . \
+ 			javax.servlet javax.servlet.http javax.servlet.jsp
+
+ .PHONY : clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-classpathx_servlet.git/commitdiff/ffaf2956bf7cab4d624823cfffa884fca40275a5



More information about the pld-cvs-commit mailing list