[packages/java-forrest] build fixes

arekm arekm at pld-linux.org
Sat Apr 4 15:07:19 CEST 2026


commit 83e7987077fc4c3048f60ee26e1f90fa99ffb6c5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 15:07:12 2026 +0200

    build fixes

 java-forrest-encoding.patch | 12 ++++++++++++
 java-forrest.spec           | 10 +++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/java-forrest.spec b/java-forrest.spec
index b5272e3..77da37a 100644
--- a/java-forrest.spec
+++ b/java-forrest.spec
@@ -3,9 +3,11 @@
 # - rename to java-xml-forrest? or rename to forrest when main pkg target is cli?
 #
 # Conditional build:
-%bcond_without	javadoc		# don't build javadoc
+%bcond_with	javadoc		# build javadoc (no javadoc target in build system)
 %bcond_without	tests		# don't build and run tests
 
+%{?use_default_jdk:%use_default_jdk 8}
+
 %define		srcname		xml-forrest
 Summary:	Apache Forrest software is a publishing framework
 Name:		java-forrest
@@ -15,12 +17,13 @@ License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/forrest/apache-forrest-%{version}.tar.gz
 # Source0-md5:	56799bac54f79cd26a8ba29b10904259
+Patch0:		java-forrest-encoding.patch
 URL:		http://forrest.apache.org/
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,6 +53,7 @@ Javadoc pour Apache Forrest.
 
 %prep
 %setup -q -n apache-forrest-%{version}
+%patch -P0 -p1
 
 %build
 cd main
diff --git a/java-forrest-encoding.patch b/java-forrest-encoding.patch
new file mode 100644
index 0000000..979f181
--- /dev/null
+++ b/java-forrest-encoding.patch
@@ -0,0 +1,12 @@
+--- a/main/build.xml	2007-09-25 17:49:56.000000000 +0200
++++ b/main/build.xml	2026-04-04 12:00:00.000000000 +0200
+@@ -435,7 +435,8 @@
+       optimize=      "${build.compiler.optimize}"
+       deprecation=   "${build.compiler.deprecation}"
+       nowarn=        "${build.compiler.nowarn}"
+-      classpathref=  "classpath"></javac>
++      classpathref=  "classpath"
++      encoding=      "ISO-8859-1"></javac>
+   </target>
+ <!-- =================================================================== -->
+ <!-- Jar Cocoon classes                                                  -->
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-forrest.git/commitdiff/83e7987077fc4c3048f60ee26e1f90fa99ffb6c5



More information about the pld-cvs-commit mailing list