[totpcgi] Use %_selinux_policy_version macro for totpcgi-selinux dependency
Michael Schwendt
mschwendt at fedoraproject.org
Wed May 7 11:41:52 UTC 2014
commit 7a7401abacc56b5a0005bf0956c10fc8e3642d0d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed May 7 13:42:14 2014 +0200
Use %_selinux_policy_version macro for totpcgi-selinux dependency
(as defined in /usr/lib/rpm/macros.d/macros.selinux-policy) to fix
invalid dependency on file:///usr/share/doc/selinux-policy/html/index.html
totpcgi.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/totpcgi.spec b/totpcgi.spec
index de87df9..5112405 100644
--- a/totpcgi.spec
+++ b/totpcgi.spec
@@ -1,6 +1,12 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+%if 0%{?fedora} > 19
+# from /usr/lib/rpm/macros.d/macros.selinux-policy
+%global selinux_policyver %{_selinux_policy_version}
+%else
+# TODO: this does not work anymore as of Fedora 20
+%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+%endif
%define selinux_variants mls strict targeted
@@ -11,7 +17,7 @@
Name: totpcgi
Version: 0.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A centralized totp solution based on google-authenticator
License: GPLv2+
@@ -205,6 +211,11 @@ fi
%changelog
+* Wed May 7 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.5-2
+- Use %%_selinux_policy_version macro for totpcgi-selinux dependency
+ (as defined in /usr/lib/rpm/macros.d/macros.selinux-policy) to fix
+ invalid dependency on file:///usr/share/doc/selinux-policy/html/index.html
+
* Fri Sep 20 2013 Konstantin Ryabitsev <mricon at kernel.org> - 0.5.5-1
- Upstream 0.5.5 with new features.
More information about the scm-commits
mailing list