From d6add94b17c95e3212707d6a54e32da75ccccd81cf800f9384bd52f0bcfc225d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Mar 2019 05:32:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=40 --- slf4j-sources.changes | 6 ++++++ slf4j.changes | 6 ++++++ slf4j.spec | 3 +++ 3 files changed, 15 insertions(+) diff --git a/slf4j-sources.changes b/slf4j-sources.changes index d2ee968..c572839 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba + +- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the + manifests. + ------------------------------------------------------------------- Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba diff --git a/slf4j.changes b/slf4j.changes index d2ee968..c572839 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba + +- Fix an unexpanded ${parsedVersion.osgiVersion} variable in the + manifests. + ------------------------------------------------------------------- Mon Mar 18 09:34:22 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 9020054..de02927 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -145,6 +145,9 @@ sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ %{_bindir}/xargs -t perl -pi -e 's/\r$//g' +# Unexpanded variable in the manifests +perl -pi -e 's#\${parsedVersion\.osgiVersion}#%{version}#g' */src/main/resources/META-INF/MANIFEST.MF + # The general pattern is that the API package exports API classes and does # # not require impl classes. slf4j was breaking that causing "A cycle was # # detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api."