Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 4f203d779c59eaa9458e492c2b1a7b1747098807
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 21 12:53:24 2014 +0200
follow selinux packaging draft
http://fedoraproject.org/wiki/SELinux_Policy_Modules_Packaging_Draft
---------------------------------------------------------------
backend/copr-backend.spec | 2 ++
backend/copr-be.py | 2 ++
selinux/copr-selinux-enable | 2 +-
selinux/copr-selinux.spec | 11 ++++++++---
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 86d1885..49392d9 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -44,6 +44,8 @@ Requires: python-daemon
Requires: python-lockfile
Requires: python-requests
Requires: python-setproctitle
+Requires: python-retask
+Requires: redis
Requires: logrotate
Requires: fedmsg
Requires: gawk
diff --git a/backend/copr-be.py b/backend/copr-be.py
index 57fdcf8..456ea65 100755
--- a/backend/copr-be.py
+++ b/backend/copr-be.py
@@ -5,6 +5,8 @@ from backend import errors
from backend.dispatcher import Worker
from backend.actions import Action
from bunch import Bunch
+from retask.task import Task
+from retask.queue import Queue
import ConfigParser
import daemon
import glob
diff --git a/selinux/copr-selinux-enable b/selinux/copr-selinux-enable
index 4fdc03e..fdcefb1 100755
--- a/selinux/copr-selinux-enable
+++ b/selinux/copr-selinux-enable
@@ -1,7 +1,7 @@
#!/bin/bash
# Install SELinux policy modules
-for selinuxvariant in targeted; do
+for selinuxvariant in targeted mls; do
/usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
&& /usr/sbin/semodule -s ${selinuxvariant} -i
/usr/share/selinux/${selinuxvariant}/copr.pp.bz2
done
diff --git a/selinux/copr-selinux.spec b/selinux/copr-selinux.spec
index 197a48b..74309c1 100644
--- a/selinux/copr-selinux.spec
+++ b/selinux/copr-selinux.spec
@@ -2,8 +2,10 @@
%global _pkgdocdir %{_docdir}/%{name}-%{version}
%global __python2 %{__python}
%endif
+
%global moduletype apps
%global modulename copr
+%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e
's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp
2>/dev/null)}
Name: copr-selinux
Version: 1.30
@@ -30,6 +32,9 @@ Requires(post): policycoreutils, libselinux-utils
Requires(post): policycoreutils-python
Requires(post): selinux-policy-targeted
Requires(postun): policycoreutils
+%if "%{_selinux_policy_version}" != ""
+Requires: selinux-policy >= %{_selinux_policy_version}
+%endif
%description
@@ -48,7 +53,7 @@ a2x -d manpage -f manpage man/copr-selinux-enable.8.asciidoc
a2x -d manpage -f manpage man/copr-selinux-relabel.8.asciidoc
perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./,
"%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
-for selinuxvariant in targeted; do
+for selinuxvariant in targeted mls; do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
bzip2 -9 %{modulename}.pp
mv %{modulename}.pp.bz2 %{modulename}.pp.bz2.${selinuxvariant}
@@ -56,7 +61,7 @@ for selinuxvariant in targeted; do
done
%install
-for selinuxvariant in targeted; do
+for selinuxvariant in targeted mls; do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
install -p -m 644 %{modulename}.pp.bz2.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp.bz2
@@ -87,7 +92,7 @@ fi
%postun
# Clean up after package removal
if [ $1 -eq 0 ]; then
- for selinuxvariant in targeted; do
+ for selinuxvariant in targeted mls; do
/usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
&& /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
done