From 5d555d4beb709aa70a6a0e3eed5d7e904f98cc6b0747f51116c1d71ddfcc10f7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Nov 2017 14:57:57 +0000 Subject: [PATCH 1/3] Accepting request 544682 from home:RBrownSUSE:branches:Base:System Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544682 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=253 --- polkit-default-privs.changes | 6 ++++++ polkit-default-privs.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index 39adc7e..b61ce31 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:40:08 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Oct 25 11:55:52 UTC 2017 - krahmer@suse.com diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index 375abd7..f46a776 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -17,6 +17,11 @@ # icecream 0 +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: polkit-default-privs Version: 13.2 Release: 0 @@ -69,6 +74,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/ /sbin/chkstat-polkit /sbin/set_polkit_default_privs %_mandir/man*/* -/var/adm/fillup-templates/sysconfig.security-polkit_default_privs +%{_fillupdir}/sysconfig.security-polkit_default_privs %changelog From befca5299f3a6ff248cbc9bc4329f3c38053270065a6a58059360929f7b97a11 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 24 Nov 2017 09:36:14 +0000 Subject: [PATCH 2/3] - Fixed usage of %_fillupdir macro, needs to be passed to `make install` such that the file is installed into the right location. OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=254 --- polkit-default-privs.changes | 6 ++++++ polkit-default-privs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index b61ce31..fd860f9 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 24 09:35:28 UTC 2017 - matthias.gerstner@suse.com + +- Fixed usage of %_fillupdir macro, needs to be passed to `make install` such + that the file is installed into the right location. + ------------------------------------------------------------------- Thu Nov 23 13:40:08 UTC 2017 - rbrown@suse.com diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec index f46a776..e7efc06 100644 --- a/polkit-default-privs.spec +++ b/polkit-default-privs.spec @@ -57,7 +57,7 @@ Authors: %build %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT fillupdir="%{_fillupdir}" mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/ > $RPM_BUILD_ROOT/etc/polkit-1/rules.d/90-default-privs.rules From 91e1d5ff63405d517140ddd5e13c8b649b384608333f536238edb0898a145715 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Nov 2017 10:23:23 +0000 Subject: [PATCH 3/3] Accepting request 546384 from home:krahmer:branches:Base:System - polkit-default-privs: adding new sddm kcm actions (bsc#1065563) OBS-URL: https://build.opensuse.org/request/show/546384 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit-default-privs?expand=0&rev=255 --- polkit-default-privs-13.2.tar.bz2 | 4 ++-- polkit-default-privs.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/polkit-default-privs-13.2.tar.bz2 b/polkit-default-privs-13.2.tar.bz2 index 2139cf1..52df62c 100644 --- a/polkit-default-privs-13.2.tar.bz2 +++ b/polkit-default-privs-13.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd5699cea2792cd23855a5792820b8481c0daf60f3266185035573aac2695c66 -size 21056 +oid sha256:cbc5cd4353de8545fb3f8eb965baf09268c2cc740b76e2c599f9c0378a696379 +size 21091 diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes index fd860f9..511358b 100644 --- a/polkit-default-privs.changes +++ b/polkit-default-privs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 29 09:29:13 UTC 2017 - krahmer@suse.com + +- polkit-default-privs: adding new sddm kcm actions (bsc#1065563) + ------------------------------------------------------------------- Fri Nov 24 09:35:28 UTC 2017 - matthias.gerstner@suse.com