This commit is contained in:
parent
f2d2e99ae9
commit
5e42dde6d9
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 1 11:33:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Build against the new log4j12 compat package
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 4 11:35:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Thu Apr 4 11:35:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ BuildRequires: fdupes
|
|||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: log4j
|
BuildRequires: log4j12
|
||||||
BuildRequires: objectweb-asm >= 5
|
BuildRequires: objectweb-asm >= 5
|
||||||
BuildRequires: slf4j
|
BuildRequires: slf4j
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
@ -106,14 +106,14 @@ for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect;
|
|||||||
pushd $i
|
pushd $i
|
||||||
mkdir -p build/classes
|
mkdir -p build/classes
|
||||||
javac -d build/classes -encoding utf-8 -source 6 -target 6 \
|
javac -d build/classes -encoding utf-8 -source 6 -target 6 \
|
||||||
-cp $(build-classpath log4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \
|
-cp $(build-classpath log4j12/log4j-12 commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \
|
||||||
$(find src/main/java -name *.java)
|
$(find src/main/java -name *.java)
|
||||||
jar cf $i.jar -C build/classes .
|
jar cf $i.jar -C build/classes .
|
||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
mkdir -p build/apidoc
|
mkdir -p build/apidoc
|
||||||
javadoc -d build/apidoc -source 6 -encoding utf-8 \
|
javadoc -d build/apidoc -source 6 -encoding utf-8 \
|
||||||
-classpath $(build-classpath log4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \
|
-classpath $(build-classpath log4j12/log4j-12 commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \
|
||||||
$(for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs)
|
$(for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs)
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
x
Reference in New Issue
Block a user