Fix broken OSGi metadata

This commit is contained in:
Mat Booth 2020-03-20 11:14:19 +00:00
parent 5e079718cd
commit c607565d85

View File

@ -30,7 +30,7 @@
Name: slf4j Name: slf4j
Version: 1.7.30 Version: 1.7.30
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 0 Epoch: 0
Summary: Simple Logging Facade for Java Summary: Simple Logging Facade for Java
# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
@ -165,7 +165,7 @@ find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
# during build time, it is necessary to mark the imported package as an # during build time, it is necessary to mark the imported package as an
# optional one. # optional one.
# Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283 # Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283
sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF sed -i '/Import-Package/s/\}$/};resolution:=optional/' slf4j-api/src/main/resources/META-INF/MANIFEST.MF
# Source JARs for are required by Maven 3.4.0 # Source JARs for are required by Maven 3.4.0
%mvn_package :::sources: sources %mvn_package :::sources: sources
@ -212,6 +212,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
%{_defaultdocdir}/%{name}-manual %{_defaultdocdir}/%{name}-manual
%changelog %changelog
* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 0:1.7.30-2
- Fix broken OSGi metadata
* Wed Feb 05 2020 Dinesh Prasanth M K <dmoluguw@redhat.com> - 0:1.7.30-1 * Wed Feb 05 2020 Dinesh Prasanth M K <dmoluguw@redhat.com> - 0:1.7.30-1
- Update to upstream version 1.7.30 - Update to upstream version 1.7.30