From 66c505aac73a429dec9f389ec849e0719adf27515f20e1095db3d7768ab6507f Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 11 Dec 2017 13:51:55 +0000 Subject: [PATCH] Accepting request 555986 from home:dimstar:Factory - Rename local defines USER/GROUP to PKG_USER/PKG_GROUP: the variable GROUP (call caps) has been claimed by RPM 4.14. OBS-URL: https://build.opensuse.org/request/show/555986 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=136 --- pcsc-lite.changes | 6 ++++++ pcsc-lite.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pcsc-lite.changes b/pcsc-lite.changes index bf349e9..b4f82ea 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 11 13:37:09 UTC 2017 - dimstar@opensuse.org + +- Rename local defines USER/GROUP to PKG_USER/PKG_GROUP: the + variable GROUP (call caps) has been claimed by RPM 4.14. + ------------------------------------------------------------------- Thu Nov 23 13:52:37 UTC 2017 - rbrown@suse.com diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 17bdd55..9034bb3 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -23,8 +23,8 @@ # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do: %define ifddir %{_libdir}/readers -%define USER scard -%define GROUP scard +%define PKG_USER scard +%define PKG_GROUP scard Name: pcsc-lite Version: 1.8.22 Release: 0 @@ -143,8 +143,8 @@ cp -a AUTHORS ChangeLog COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TO find %{buildroot} -type f -name "*.la" -delete -print %pre -getent group %{GROUP} >/dev/null || groupadd -r %{GROUP} -getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s %{_sbindir}/nologin -c "Smart Card Reader" -d %{_localstatedir}/run/pcscd %{USER} +getent group %{PKG_GROUP} >/dev/null || groupadd -r %{PKG_GROUP} +getent passwd %{PKG_USER} >/dev/null || useradd -r -g %{PKG_GROUP} -s %{_sbindir}/nologin -c "Smart Card Reader" -d %{_localstatedir}/run/pcscd %{PKG_USER} %service_add_pre pcscd.service pcscd.socket %post