[ovirt-guest-agent/el5] Removed selinux-policy conflict - Should not be applicable

Vinzenz Feenstra evilissimo at fedoraproject.org
Mon Nov 25 09:54:53 UTC 2013


commit 33a5d11abd3c95e5cbad17d309d902cd99c4bf20
Author: Vinzenz Feenstra <vfeenstr at redhat.com>
Date:   Mon Nov 25 10:54:14 2013 +0100

    Removed selinux-policy conflict - Should not be applicable
    
    Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>

 ovirt-guest-agent.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ovirt-guest-agent.spec b/ovirt-guest-agent.spec
index ba667b9..8dd8596 100644
--- a/ovirt-guest-agent.spec
+++ b/ovirt-guest-agent.spec
@@ -1,5 +1,5 @@
 
-%global release_version 3
+%global release_version 4
 
 Name: ovirt-guest-agent
 Version: 1.0.8
@@ -26,9 +26,6 @@ Requires(preun): initscripts
 Conflicts: rhev-agent
 Conflicts: rhevm-guest-agent
 Conflicts: rhevm-guest-agent-common
-%if 0%{?rhel} <= 6
-Conflicts: selinux-policy < 3.7.19-188
-%endif
 
 %description
 This is the oVirt management agent running inside the guest. The agent
@@ -42,6 +39,7 @@ restart).
 
 %configure --without-sso
 
+
 %install
 rm -rf %{buildroot}
 pushd .
@@ -120,7 +118,10 @@ fi
 
 
 %changelog
-* Thu Jul 11 2013 Vinzenz Feenstra <evilissimo at redhat.com> - 1.0.8-3
+* Mon Nov 25 2013 Vinzenz Feenstra <evilissimo at redhat.com> - 1.0.8-4
+  - Removed selinux policy conflicts
+
+* Mon Nov 25 2013 Vinzenz Feenstra <evilissimo at redhat.com> - 1.0.8-3
   - EL5 adjustments and update to upstream 1.0.8.1 sources
 
 * Thu Jul 11 2013 Vinzenz Feenstra <evilissimo at redhat.com> - 1.0.8-1


More information about the scm-commits mailing list