pool/velocity
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 957056 from Java:packages

Browse Source 
Build against reload4j

OBS-URL: https://build.opensuse.org/request/show/957056
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/velocity?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2022-02-23 18:06:54 +00:00 committed by Git OBS Bridge
commit 080163109d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
velocity.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 22 18:59:05 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not build against the log4j12 packages, use the new reload4j
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 12 08:18:50 UTC 2021 - Fridrich Strba <fstrba@suse.com> Fri Mar 12 08:18:50 UTC 2021 - Fridrich Strba <fstrba@suse.com>

8
velocity.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package velocity # spec file for package velocity
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -39,9 +39,9 @@ BuildRequires: hsqldb
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jdom >= 1.0-1 BuildRequires: jdom >= 1.0-1
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j12 >= 1.1
BuildRequires: oro BuildRequires: oro
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: reload4j
BuildRequires: servletapi4 BuildRequires: servletapi4
BuildRequires: werken-xpath BuildRequires: werken-xpath
Requires: avalon-logkit Requires: avalon-logkit
@ -49,8 +49,8 @@ Requires: commons-collections
Requires: commons-lang Requires: commons-lang
Requires: java >= 1.6.0 Requires: java >= 1.6.0
Requires: jdom >= 1.0-1 Requires: jdom >= 1.0-1
Requires: log4j12 >= 1.1
Requires: oro Requires: oro
Requires: reload4j
Requires: servletapi4 Requires: servletapi4
Requires: werken-xpath Requires: werken-xpath
BuildArch: noarch BuildArch: noarch
@ -185,7 +185,7 @@ ln -sf $(build-classpath commons-collections)
ln -sf $(build-classpath commons-lang) ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath commons-logging) ln -sf $(build-classpath commons-logging)
ln -sf $(build-classpath jdom) ln -sf $(build-classpath jdom)
ln -sf $(build-classpath log4j12/log4j-12) ln -sf $(build-classpath reload4j/reload4j)
ln -sf $(build-classpath oro) ln -sf $(build-classpath oro)
# Use servletapi4 instead of servletapi5 in CLASSPATH # Use servletapi4 instead of servletapi5 in CLASSPATH
ln -sf $(build-classpath servletapi4) ln -sf $(build-classpath servletapi4)