forked from pool/apache-commons-logging
- Remove bootstrap conditional
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=27
This commit is contained in:
parent
6c766d5c43
commit
3f26aa8ab9
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Remove bootstrap conditional
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 19 10:51:10 UTC 2017 - pcervinka@suse.com
|
Fri May 19 10:51:10 UTC 2017 - pcervinka@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package apache-commons-logging
|
# spec file for package apache-commons-logging
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2007, JPackage Project
|
# Copyright (c) 2000-2007, JPackage Project
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
%define base_name logging
|
%define base_name logging
|
||||||
%define short_name commons-%{base_name}
|
%define short_name commons-%{base_name}
|
||||||
%bcond_with java_bootstrap
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.2
|
Version: 1.2
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -33,6 +32,7 @@ Source2: apache-commons-logging.keyring
|
|||||||
Source3: http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
|
Source3: http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
|
||||||
Patch0: commons-logging-1.1.3-src-junit.diff
|
Patch0: commons-logging-1.1.3-src-junit.diff
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
|
BuildRequires: ant-junit
|
||||||
BuildRequires: apache-commons-parent
|
BuildRequires: apache-commons-parent
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
@ -41,16 +41,11 @@ BuildRequires: junit
|
|||||||
BuildRequires: log4j-mini >= 1.2
|
BuildRequires: log4j-mini >= 1.2
|
||||||
BuildRequires: servletapi5
|
BuildRequires: servletapi5
|
||||||
Requires: java >= 1.6.0
|
Requires: java >= 1.6.0
|
||||||
Requires: javapackages-tools
|
|
||||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||||
Obsoletes: jakarta-%{short_name} < %{version}
|
Obsoletes: jakarta-%{short_name} < %{version}
|
||||||
Provides: %{short_name} = %{version}-%{release}
|
Provides: %{short_name} = %{version}-%{release}
|
||||||
Obsoletes: %{short_name} < %{version}
|
Obsoletes: %{short_name} < %{version}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if !%{with java_bootstrap}
|
|
||||||
BuildRequires: ant-junit
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The commons-logging package provides a simple, component oriented
|
The commons-logging package provides a simple, component oriented
|
||||||
|
Loading…
x
Reference in New Issue
Block a user