From c2cffb1fe3d6ea08aa31bb442d714d6339b6e2ad5cd1c739e9d6f6466c3344a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 19 Sep 2018 08:39:04 +0000 Subject: [PATCH] Accepting request 636236 from home:1Antoine1:branches:Printing - Fix warning message upon update (boo#1050845): Remove template service cups-lpd@ from service_* macro in scriptlets. OBS-URL: https://build.opensuse.org/request/show/636236 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=351 --- cups.changes | 6 ++++++ cups.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cups.changes b/cups.changes index 0c99de3..8c75f4d 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 14 05:30:55 UTC 2018 - antoine.belvire@opensuse.org + +- Fix warning message upon update (boo#1050845): Remove template + service cups-lpd@ from service_* macro in scriptlets. + ------------------------------------------------------------------- Wed Apr 18 13:44:46 CEST 2018 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index 96947c0..362afa3 100644 --- a/cups.spec +++ b/cups.spec @@ -461,18 +461,18 @@ EOF %pre -p /bin/bash getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin -%service_add_pre cups.service cups-lpd@.service cups-lpd.socket cups.socket +%service_add_pre cups.service cups-lpd.socket cups.socket %post -p /bin/bash -%service_add_post cups.service cups-lpd@.service cups-lpd.socket cups.socket +%service_add_post cups.service cups-lpd.socket cups.socket # Use %%tmpfiles_create when 13.2 is oldest in support scope /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/cups.conf || : %preun -p /bin/bash -%service_del_preun cups.service cups-lpd@.service cups-lpd.socket cups.socket +%service_del_preun cups.service cups-lpd.socket cups.socket %postun -p /bin/bash -%service_del_postun cups.service cups-lpd@.service cups-lpd.socket cups.socket +%service_del_postun cups.service cups-lpd.socket cups.socket %posttrans -p /bin/bash # Use a real bash script with an explicit "exit 0" at the end to be by default fail safe