[tests/selinux] pr775-checkpolicy-revdeps: org.selinux dbus interface is shipped by policycoreutils-dbus

[tests/selinux] pr775-checkpolicy-revdeps: org.selinux dbus interface is shipped by policycoreutils-dbus

[Petr Lautrbach]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 933ad30a555d8882dad49c835e17b43327635eaf
            Author : Petr Lautrbach <plautrba@redhat.com>
            Date   : 2020-01-24T11:11:20+01:00
            Stats  : +3/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/933ad30a555d8882dad49c835e17b43327635eaf?branch=pr775-checkpolicy-revdeps

            Log:
            org.selinux dbus interface is shipped by policycoreutils-dbus

In past it was policycoreutils-gui so check whether at least one of them is
installed.

Resolves: https://src.fedoraproject.org/tests/selinux/issue/39

---
diff --git a/policycoreutils/org-selinux-dbus-interfaces/Makefile b/policycoreutils/org-selinux-dbus-interfaces/Makefile
index e1ffb14..0c1643a 100644
--- a/policycoreutils/org-selinux-dbus-interfaces/Makefile
+++ b/policycoreutils/org-selinux-dbus-interfaces/Makefile
@@ -53,7 +53,7 @@ $(METADATA): Makefile
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils-gui selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)
+	@echo "Requires:        policycoreutils-dbus selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)

diff --git a/policycoreutils/org-selinux-dbus-interfaces/runtest.sh b/policycoreutils/org-selinux-dbus-interfaces/runtest.sh
index 8c1a879..458c695 100755
--- a/policycoreutils/org-selinux-dbus-interfaces/runtest.sh
+++ b/policycoreutils/org-selinux-dbus-interfaces/runtest.sh
@@ -35,7 +35,8 @@ PACKAGE="policycoreutils"
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm ${PACKAGE}
-        rlAssertRpm ${PACKAGE}-gui
+        # In past, org.selinux dbus interface was shipped in policycoreutils-gui
+        rlRun "rpm -q policycoreutils-dbus || rpm -q policycoreutils-gui" 0
         rlFileBackup /etc/selinux/config
         rlRun "gdbus introspect --system -d org.selinux -o /"
         rlRun "gdbus introspect --system -d org.selinux -o /org"