From d03137a514f205e432f00b21c5e356c6b36b6f78bb09d8b5c9cc8a48d390d864 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Fri, 16 Jun 2017 14:38:17 +0000 Subject: [PATCH] Re-add openQA-rpmlintrc for older versions OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=19 --- openQA-rpmlintrc | 1 + openQA.spec | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 openQA-rpmlintrc diff --git a/openQA-rpmlintrc b/openQA-rpmlintrc new file mode 100644 index 00000000..0bf5fd92 --- /dev/null +++ b/openQA-rpmlintrc @@ -0,0 +1 @@ +setBadness('suse-dbus-unauthorized-service', 0) diff --git a/openQA.spec b/openQA.spec index 93977f18..bdda150e 100644 --- a/openQA.spec +++ b/openQA.spec @@ -47,6 +47,10 @@ Source0: %{name}-%{version}.tar.xz # a workaround for set_version looking at random files (so we can't name it .tar.xz) # use update-cache to update it Source1: cache.txz +# audited dbus service is not accepted in older versions +%if %suse_version < 1330 +Source100: openQA-rpmlintrc +%endif Source101: update-cache.sh ExcludeArch: i586 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -190,6 +194,9 @@ OBS_RUN=1 prove -r -j2 -v %install %make_install +%if %suse_version >= 1330 +rm -f openQA-rpmlintrc +%endif mkdir -p %{buildroot}/usr/share/openqa/etc/openqa ln -s /etc/openqa/openqa.ini %{buildroot}/usr/share/openqa/etc/openqa/openqa.ini