From 128acfff3acce5561399e5cca2e31aa856bb511ad783fe70260e755de273e71f Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 8 Jul 2020 07:50:44 +0000 Subject: [PATCH] Accepting request 819264 from home:gmbr3:Active - Removed dbus-libexec.patch: contained in upstream OBS-URL: https://build.opensuse.org/request/show/819264 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=270 --- dbus-libexec.patch | 36 ------------------------------------ permissions.changes | 5 +++++ permissions.spec | 3 +-- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 dbus-libexec.patch diff --git a/dbus-libexec.patch b/dbus-libexec.patch deleted file mode 100644 index e5bebee..0000000 --- a/dbus-libexec.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: permissions-20200526/profiles/permissions.easy -=================================================================== ---- permissions-20200526.orig/profiles/permissions.easy -+++ permissions-20200526/profiles/permissions.easy -@@ -267,6 +267,7 @@ - /lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - # dbus-1 in /usr #1056764) - /usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 -+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - /usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - - # policycoreutils (#440596) -Index: permissions-20200526/profiles/permissions.paranoid -=================================================================== ---- permissions-20200526.orig/profiles/permissions.paranoid -+++ permissions-20200526/profiles/permissions.paranoid -@@ -278,6 +278,7 @@ - /lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 0750 - # dbus-1 in /usr #1056764) - /usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 0750 -+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 0750 - /usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 0750 - - # policycoreutils (#440596) -Index: permissions-20200526/profiles/permissions.secure -=================================================================== ---- permissions-20200526.orig/profiles/permissions.secure -+++ permissions-20200526/profiles/permissions.secure -@@ -308,6 +308,7 @@ - /lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - # dbus-1 in /usr #1056764) - /usr/lib/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 -+/usr/libexec/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - /usr/lib64/dbus-1/dbus-daemon-launch-helper root:messagebus 4750 - - # policycoreutils (#440596) diff --git a/permissions.changes b/permissions.changes index c7a2bfa..8e0ba3d 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 7 15:56:02 UTC 2020 - Callum Farmer + +- Removed dbus-libexec.patch: contained in upstream + ------------------------------------------------------------------- Tue Jul 07 13:25:40 UTC 2020 - matthias.gerstner@suse.com diff --git a/permissions.spec b/permissions.spec index 3669789..ec5b389 100644 --- a/permissions.spec +++ b/permissions.spec @@ -28,7 +28,6 @@ Group: Productivity/Security URL: http://github.com/openSUSE/permissions Source: permissions-%{VERSION_DATE}.tar.xz Source1: fix_version.sh -Patch0: dbus-libexec.patch BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libcap-progs @@ -41,7 +40,7 @@ Recommends: permissions-doc Provides: aaa_base:%{_datadir}/permissions %prep -%autosetup -p1 -n permissions-%{VERSION_DATE} +%autosetup -n permissions-%{VERSION_DATE} %build make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0