From 68a1af5ff80ede5588dc23f136ccf1872e26571fb87f6080714ab8afc0435410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:26:00 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-beanutils revision aab16f5ffe8c01d5391335d85e8e7f99 --- apache-commons-beanutils.changes | 11 +++++++++++ apache-commons-beanutils.spec | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes index afa75fc..8d9d4af 100644 --- a/apache-commons-beanutils.changes +++ b/apache-commons-beanutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 22 07:14:51 UTC 2024 - Fridrich Strba + +- Fix build with SLE12 + +------------------------------------------------------------------- +Tue Feb 20 10:24:45 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Tue Oct 31 08:36:54 UTC 2023 - Fridrich Strba diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 3ab1919..4b352f8 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-beanutils # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,9 +59,9 @@ This package contains the javadoc documentation for the Jakarta Commons BeanUtils Package. %prep -%setup -q -n %{short_name}-%{version}-src -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n %{short_name}-%{version}-src + +# The previous empty line needs to be maintained for sle12 compatibility sed -i 's/\r//' *.txt # bug in ant build touch README.txt