mirror of
https://abf.rosa.ru/djam/java-1.8.0-openjdk.git
synced 2025-04-20 15:34:20 +00:00
rpm5 -> rpm4 (7)
This commit is contained in:
parent
5ba99c9953
commit
d79bb47fcc
1 changed files with 0 additions and 10 deletions
|
@ -740,8 +740,6 @@ Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release}
|
||||||
Provides: java%{?1} = %{epoch}:%{javaver}
|
Provides: java%{?1} = %{epoch}:%{javaver}
|
||||||
# Standard JPackage extensions provides.
|
# Standard JPackage extensions provides.
|
||||||
Provides: java-fonts%{?1} = %{epoch}:%{version}
|
Provides: java-fonts%{?1} = %{epoch}:%{version}
|
||||||
|
|
||||||
Obsoletes: java-1.7.0-openjdk%{?1} < %{EVRD}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%global java_headless_rpo() %{expand:
|
%global java_headless_rpo() %{expand:
|
||||||
|
@ -800,8 +798,6 @@ Provides: java-sdk%{?1} = %{epoch}:%{javaver}
|
||||||
Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}
|
Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}
|
||||||
Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}
|
Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}
|
||||||
Provides: java-devel%{?1} = %{epoch}:%{javaver}
|
Provides: java-devel%{?1} = %{epoch}:%{javaver}
|
||||||
|
|
||||||
Obsoletes: java-1.7.0-openjdk-devel%{?1} < %{EVRD}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -823,22 +819,16 @@ Requires(postun): update-alternatives
|
||||||
Provides: java-javadoc%{?1} = %{epoch}:%{version}-%{release}
|
Provides: java-javadoc%{?1} = %{epoch}:%{version}-%{release}
|
||||||
Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release}
|
Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Obsoletes: java-1.7.0-openjdk-javadoc%{?1} < %{EVRD}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%global java_src_rpo() %{expand:
|
%global java_src_rpo() %{expand:
|
||||||
Requires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
|
Requires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Obsoletes: java-1.7.0-openjdk-src%{?1} < %{EVRD}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%global java_accessibility_rpo() %{expand:
|
%global java_accessibility_rpo() %{expand:
|
||||||
Requires: java-atk-wrapper
|
Requires: java-atk-wrapper
|
||||||
Requires: %{name}%{?1} = %{epoch}:%{version}-%{release}
|
Requires: %{name}%{?1} = %{epoch}:%{version}-%{release}
|
||||||
#OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
|
#OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Obsoletes: java-1.7.0-openjdk-accessibility%{?1} < %{EVRD}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prevent brp-java-repack-jars from being run.
|
# Prevent brp-java-repack-jars from being run.
|
||||||
|
|
Loading…
Add table
Reference in a new issue