[packages/java-commons-logging] add helper macro for find-jar

atler atler at pld-linux.org
Thu May 7 13:16:25 CEST 2026


commit e283769275d4a8b02203700eeffd3eb2a7fa86bd
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu May 7 13:15:50 2026 +0200

    add helper macro for find-jar

 java-commons-logging.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/java-commons-logging.spec b/java-commons-logging.spec
index 3e94651..45b953b 100644
--- a/java-commons-logging.spec
+++ b/java-commons-logging.spec
@@ -35,6 +35,8 @@ Obsoletes:	jakarta-commons-logging
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		find_jar()	%(JAVA_HOME="%{java_home}" find-jar %1 2>/dev/null)
+
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
@@ -58,12 +60,12 @@ na używanie pakietu samodzielnie.
 
 %build
 cat > build.properties << EOF
-log4j12.jar=%(find-jar log4j 2>/dev/null)
-junit.jar=%(find-jar junit 2>/dev/null)
-logkit.jar=%(find-jar avalon-logkit 2>/dev/null)
-avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar 2>/dev/null)
-avalon-framework-api.jar=%(find-jar avalon-framework-api.jar 2>/dev/null)
-servletapi.jar=%(find-jar servlet-api.jar 2>/dev/null)
+log4j12.jar=%{find_jar log4j}
+junit.jar=%{find_jar junit}
+logkit.jar=%{find_jar avalon-logkit}
+avalon-framework-impl.jar=%{find_jar avalon-framework-impl.jar}
+avalon-framework-api.jar=%{find_jar avalon-framework-api.jar}
+servletapi.jar=%{find_jar servlet-api.jar}
 EOF
 
 ! grep -q '=$' build.properties
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-commons-logging.git/commitdiff/e283769275d4a8b02203700eeffd3eb2a7fa86bd



More information about the pld-cvs-commit mailing list