rpm5 -> rpm4 (7)

This commit is contained in:
Victor Ryzhikh 2020-02-28 17:46:37 +00:00
parent b61a8032c8
commit b95d9c8f15

View file

@ -726,7 +726,7 @@ Requires: fontconfig
Requires: x11-font-type1 Requires: x11-font-type1
# Requires rest of java # Requires rest of java
Requires: %{name}-headless = %{epoch}:%{version}-%{release} Requires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
#OrderWithRequires: %{name}-headless%1 = %{epoch}:%{version}-%{release} #OrderWithRequires: %{name}-headless%1 = %{epoch}:%{version}-%{release}
@ -761,6 +761,7 @@ Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun): update-alternatives
# Standard JPackage base provides. # Standard JPackage base provides.
Provides: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
Provides: jre-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
Provides: jre-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
@ -820,7 +821,7 @@ Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release}
} }
%global java_src_rpo() %{expand: %global java_src_rpo() %{expand:
Requires: %{name}-headless = %{epoch}:%{version}-%{release} Requires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
} }
%global java_accessibility_rpo() %{expand: %global java_accessibility_rpo() %{expand: