From 6c766d5c43a991f2e9fc025b7fa884868a5595b25614e1fb908e4cda49aa5a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:00:43 +0000 Subject: [PATCH 1/2] Accepting request 496603 from home:pcervinka:branches:Java:packages - New build dependency: javapackages-local - Fixed requires OBS-URL: https://build.opensuse.org/request/show/496603 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=26 --- apache-commons-logging.changes | 6 ++++++ apache-commons-logging.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index fc1fa88..c17df2b 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 19 10:51:10 UTC 2017 - pcervinka@suse.com + +- New build dependency: javapackages-local +- Fixed requires + ------------------------------------------------------------------- Sun Jan 24 13:55:36 UTC 2016 - p.drouand@gmail.com diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 2163af8..4c7aad5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-logging # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -35,14 +35,13 @@ Patch0: commons-logging-1.1.3-src-junit.diff BuildRequires: ant BuildRequires: apache-commons-parent BuildRequires: java-devel >= 1.6.0 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 Requires: java >= 1.6.0 Requires: javapackages-tools -Requires(post): javapackages-tools -Requires(postun): javapackages-tools Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version} Provides: %{short_name} = %{version}-%{release} From 3f26aa8ab9a4f238f4da9eb0dd191afeb02fa9dd55a841de2fe674128753d8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:02:37 +0000 Subject: [PATCH 2/2] - Remove bootstrap conditional OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=27 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index c17df2b..662120f 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -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 diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 4c7aad5..a2e5e98 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # 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 # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,6 @@ %define base_name logging %define short_name commons-%{base_name} -%bcond_with java_bootstrap Name: apache-%{short_name} Version: 1.2 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 Patch0: commons-logging-1.1.3-src-junit.diff BuildRequires: ant +BuildRequires: ant-junit BuildRequires: apache-commons-parent BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local @@ -41,16 +41,11 @@ BuildRequires: junit BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 Requires: java >= 1.6.0 -Requires: javapackages-tools Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version} Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if !%{with java_bootstrap} -BuildRequires: ant-junit -%endif %description The commons-logging package provides a simple, component oriented