Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-01-24 11:12:41 +0100
committerMichal Suchanek <msuchanek@suse.de>2019-01-24 11:12:41 +0100
commit219bcecdc87c33dc33589a34c9c495f2885075a2 (patch)
tree96d7271730a22843044c6a92ce92a324b739cc83
parente42315db8eba876b91cfc3ca0394dee3d2ffb276 (diff)
rpm/kernel-*.spec.in: replace update srchash dependencies (FATE#325312).
Due to some limitations version cannot be matched so move the hash into the provide name.
-rw-r--r--rpm/kernel-binary.spec.in6
-rw-r--r--rpm/kernel-docs.spec.in2
-rw-r--r--rpm/kernel-obs-build.spec.in2
-rw-r--r--rpm/kernel-source.spec.in2
-rw-r--r--rpm/kernel-syms.spec.in2
5 files changed, 7 insertions, 7 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 4b6f5ed23e..f4a2d0b312 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -165,10 +165,10 @@ Conflicts: hyper-v < 4
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash = @COMMIT_FULL@
-Provides: kernel-srchash = @COMMIT_FULL@
+Provides: kernel-%build_flavor-base-srchash-@COMMIT_FULL@
+Provides: kernel-srchash-@COMMIT_FULL@
# END COMMON DEPS
-Provides: %name-srchash = @COMMIT_FULL@
+Provides: %name-srchash-@COMMIT_FULL@
@PROVIDES_OBSOLETES@
@PROVIDES_OBSOLETES_BASE@
%obsolete_rebuilds %name
diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in
index d31d68577b..89dd278849 100644
--- a/rpm/kernel-docs.spec.in
+++ b/rpm/kernel-docs.spec.in
@@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash = @COMMIT_FULL@
+Provides: %name-srchash-@COMMIT_FULL@
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@SOURCES@
diff --git a/rpm/kernel-obs-build.spec.in b/rpm/kernel-obs-build.spec.in
index a93c0a6406..91ad608e44 100644
--- a/rpm/kernel-obs-build.spec.in
+++ b/rpm/kernel-obs-build.spec.in
@@ -45,7 +45,7 @@ BuildRequires: util-linux
%endif
%endif
%endif
-BuildRequires: kernel%kernel_flavor-srchash = @COMMIT_FULL@
+BuildRequires: kernel%kernel_flavor-srchash-@COMMIT_FULL@
%if 0%{?rhel_version}
BuildRequires: kernel
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index a8ab17f4bf..722935cb9f 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -43,7 +43,7 @@ BuildRequires: fdupes
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash = @COMMIT_FULL@
+Provides: %name-srchash-@COMMIT_FULL@
Provides: linux
Provides: multiversion(kernel)
Source0: @TARBALL_URL@linux-%srcversion.tar.xz
diff --git a/rpm/kernel-syms.spec.in b/rpm/kernel-syms.spec.in
index 12141d66a6..65b4db1d13 100644
--- a/rpm/kernel-syms.spec.in
+++ b/rpm/kernel-syms.spec.in
@@ -41,7 +41,7 @@ BuildRequires: coreutils
@REQUIRES@
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash = @COMMIT_FULL@
+Provides: %name-srchash-@COMMIT_FULL@
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel