[packages/tpm_emulator] - drop non-dist kernel support
baggins
baggins at pld-linux.org
Tue Jan 27 19:50:09 CET 2015
commit 0f8a9f1f31d873b0fe61c17633771e145c2e017a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 27 19:48:14 2015 +0100
- drop non-dist kernel support
tpm_emulator.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/tpm_emulator.spec b/tpm_emulator.spec
index 75b1113..33739ea 100644
--- a/tpm_emulator.spec
+++ b/tpm_emulator.spec
@@ -1,14 +1,9 @@
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace packages
%bcond_with verbose # verbose kernel module build
#
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -56,7 +51,7 @@ URL: http://tpm-emulator.berlios.de/
BuildRequires: cmake >= 2.4
BuildRequires: gmp-devel
BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
Requires: %{name}-libs = %{version}-%{rel}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,10 +102,8 @@ Summary: Kernel module that provides /dev/tpm device\
Summary(pl.UTF-8): Moduł jądra udostępniający urządzenie /dev/tpm\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-char-tpmd\
Kernel module that provides /dev/tpm device for backward compatibility\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tpm_emulator.git/commitdiff/9799b8e20e04dd718272198dd05b8750d14bb3be
More information about the pld-cvs-commit
mailing list