rpms
/
jdom2
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid hardcoded jar paths

Browse Source
f38
Michael Simacek 8 years ago
parent da19e0be08
commit 44476240b5
2 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File

77
jdom-2.0.5-build.patch
Unescape View File

@ -1,52 +1,36 @@
--- build.xml 2013-04-17 00:00:39.000000000 +0200
+++ build.xml-gil 2013-09-12 16:13:30.119000138 +0200
@@ -102,13 +102,13 @@
<filter token="jdk" value="${compile.target}" />
<!-- Default JAR libraries -->
- <property name="parser.jar" value="${lib.dir}/xercesImpl.jar" />
- <property name="xmlapi.jar" value="${lib.dir}/xml-apis.jar" />
- <property name="jaxen.jar" value="${lib.dir}/jaxen-1.1.6.jar" />
- <property name="junit.jar" value="${lib.dir}/junit-4.8.2.jar" />
- <property name="isorelax.jar" value="${contrib}/lib/isorelax.jar" />
- <property name="xalan.jar" value="${lib.dir}/xalan/xalan-2.7.1.jar" />
- <property name="xalanser.jar" value="${lib.dir}/xalan/serializer-2.7.1.jar" />
+ <property name="parser.jar" value="/usr/share/java/xerces-j2.jar" />
+ <property name="xmlapi.jar" value="/usr/share/java/xml-commons-apis.jar" />
+ <property name="jaxen.jar" value="/usr/share/java/jaxen.jar" />
+ <property name="junit.jar" value="/usr/share/java/junit.jar" />
+ <property name="isorelax.jar" value="/usr/share/java/isorelax.jar" />
+ <property name="xalan.jar" value="/usr/share/java/xalan-j2.jar" />
+ <property name="xalanser.jar" value="/usr/share/java/xalan-j2-serializer.jar" />
From 7fcf41703a428b255a7d7f9b1424e825dd7e1788 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 31 May 2017 13:13:48 +0200
Subject: [PATCH] Adapt build
---
build.xml | 40 +++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/build.xml b/build.xml
index 8067c61..13f88d4 100644
--- a/build.xml
+++ b/build.xml
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<!-- Compilation class path -->
<path id="base.class.path">
@@ -121,8 +121,8 @@
<pathelement location="${xalanser.jar}" />
<!-- normally these stax jars will not be found -->
<!-- this is used for testing Java5 (the test sets stax.dir) -->
- <pathelement location="${jaxen.jar}" />
- <pathelement location="${parser.jar}" />
- <pathelement location="${xmlapi.jar}" />
- <pathelement location="${junit.jar}" />
- <pathelement location="${isorelax.jar}" />
- <pathelement location="${xalan.jar}" />
- <pathelement location="${xalanser.jar}" />
- <!-- normally these stax jars will not be found -->
- <!-- this is used for testing Java5 (the test sets stax.dir) -->
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
- <pathelement location="${stax.dir}/sjsxp.jar" />
+ <pathelement location="/usr/share/java/bea-stax-api.jar" />
+ <!--pathelement location="${stax.dir}/sjsxp.jar" /-->
+ <fileset dir="${lib.dir}" includes="*.jar" />
</path>
<path id="core.class.path">
@@ -139,7 +139,12 @@
<pathelement location="${junit.instrumented}" />
<pathelement location="${junit.build}"/>
<path refid="contrib.class.path"/>
- <fileset dir="${lib.dir}/cobertura" includes="*.jar" />
+ <fileset dir="/usr/share/java/objectweb-asm" includes="asm.jar" />
+ <fileset dir="/usr/share/java/objectweb-asm" includes="asm-tree.jar" />
+ <fileset dir="/usr/share/java" includes="log4j.jar" />
+ <fileset dir="/usr/share/java" includes="cobertura.jar" />
+ <fileset dir="/usr/share/java" includes="cobertura-runtime.jar" />
+ <fileset dir="/usr/share/java" includes="jakarta-oro.jar" />
</path>
@@ -289,6 +294,7 @@
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
header="&lt;b&gt;${Name}&lt;br&gt;&lt;font size='-1'&gt;${version}&lt;/font&gt;&lt;/b&gt;"
bottom="Copyright &#169; ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
<classpath refid="base.class.path"/>
@ -54,7 +38,7 @@
</javadoc>
</target>
@@ -373,11 +379,11 @@
@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file.
<!-- =================================================================== -->
<target name="package" depends="coverage, jars"
description="Creates the class package">
@ -68,7 +52,7 @@
</target>
<!-- =================================================================== -->
@@ -401,6 +407,7 @@
@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<include name="**/*.class"/>
<!-- exclude name="**/**/jaxen/**/*.class"/ -->
</fileset>
@ -76,7 +60,7 @@
</cobertura-instrument>
<property name="forkjunit" value="true" />
@@ -528,7 +535,25 @@
@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file.
</filterset>
</copy>
@ -103,7 +87,7 @@
<arg value="-abv"/>
<arg value="${mavenbase}.pom"/>
</exec>
@@ -543,7 +568,7 @@
@@ -543,7 +553,7 @@ For instructions on how to build JDOM, please view the README.txt file.
<exec dir="${mavendir}/core" executable="${gpg}">
<arg value="-abv"/>
<arg value="${mavenbase}-javadoc.jar"/>
@ -112,3 +96,6 @@
<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
basedir="${mavendir}/core"
--
2.9.4

9
jdom2.spec
Unescape View File

@ -15,8 +15,6 @@ Source3: bnd.properties
# Process contrib and junit pom files
Patch0: jdom-2.0.5-build.patch
BuildRequires: java-devel
BuildRequires: java-javadoc
BuildRequires: javapackages-local
BuildRequires: ant
BuildRequires: ant-junit
@ -54,7 +52,7 @@ This package contains javadoc for %{name}.
find . -name "*.class" -print -delete
find . -name "*.jar" -print -delete
%patch0 -p0
%patch0 -p1
cp -p %{SOURCE1} maven/contrib.pom
cp -p %{SOURCE2} maven/junit.pom
@ -64,6 +62,8 @@ sed -i 's/\r//' LICENSE.txt README.txt
# Unable to run coverage: use log4j12 but switch to log4j 2.x
sed -i.coverage "s|coverage, jars|jars|" build.xml
build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer
%build
ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
@ -86,6 +86,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar
%license LICENSE.txt
%changelog
* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 2.0.6-7
- Avoid hardcoded jar paths
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

Write Preview
Loading…
Cancel
Save