From 87f2db1de3636721f914bb29c56a239908bbeb419c99e0a3e6ff492e2a8a11a1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Oct 2024 13:07:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=168 --- ...e_script-Remove-unneeded-backslashes.patch | 32 +++++++++++++++++++ javapackages-tools.changes | 3 ++ javapackages-tools.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch diff --git a/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch b/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch new file mode 100644 index 0000000..f1e055a --- /dev/null +++ b/0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch @@ -0,0 +1,32 @@ +From 5f1ea127c2465e2a628396c17157834c73d528c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Fri, 11 Oct 2024 15:00:52 +0200 +Subject: [PATCH] Revert "jpackage_script: Remove unneeded backslashes" + +This is broken with rpm 4.14.1 for instance + +This reverts commit 098485a23336cf7df692631d7bbb90db200d554d. +--- + macros.d/macros.jpackage | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage +index b6c41b48..ceee2a7d 100644 +--- a/macros.d/macros.jpackage ++++ b/macros.d/macros.jpackage +@@ -35,9 +35,9 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \ + #\ + # %{name} script\ + # JPackage Project \ +-%{?java_home: +-# Set default JAVA_HOME +-JAVA_HOME="\\${JAVA_HOME:-%{java_home}}" ++%{?java_home:\ ++# Set default JAVA_HOME\ ++JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\ + }\ + # Source functions library\ + . @{javadir}-utils/java-functions\ +-- +2.47.0 + diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 1ee28d8..dc6848e 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -18,6 +18,9 @@ Fri Oct 11 10:56:13 UTC 2024 - Fridrich Strba - Modified patch: * python-optional.patch + account for changed context +- Added patch: + * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch + + This change breaks build with rpm 4.14.1 ------------------------------------------------------------------- Wed Oct 9 07:27:42 UTC 2024 - Andreas Schwab diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0b23878..a9b9655 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -45,6 +45,8 @@ Patch1: python-optional.patch #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch +#PATCH-FIX-UPSTREAM: removing the backslashes breaks checks with rpm 4.14.1 +Patch3: 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch BuildRequires: fdupes BuildRequires: perl