From ba2520cfc65c96c46ce6259699297e69b84ed96d Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Mon, 12 Aug 2013 15:53:54 -0700 Subject: [PATCH] packaging: fix errors in %preun and %postun scriptlets - If /sbin/ldconfig is not the only action for a scriptlet, the -p option should not be used. - If the 'with multi user' option is not true, the shell conditional will be invalid. This commit fixes both issues. Change-Id: Ia610aad0576b9132a60f26063cbb35345ed58f92 --- packaging/aul.changes | 3 +++ packaging/aul.spec | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packaging/aul.changes b/packaging/aul.changes index db7cc83..8ea33c4 100644 --- a/packaging/aul.changes +++ b/packaging/aul.changes @@ -1,3 +1,6 @@ +* Mon Aug 12 2013 Patrick McCarty 91a6684 +- packaging: fix errors in %preun and %postun scriptlets + * Fri Aug 02 2013 Baptiste DURAND accepted/tizen/20130731.144156@ab708cb - Add build Option for multi-user support diff --git a/packaging/aul.spec b/packaging/aul.spec index a599be1..ff9ea2a 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -105,12 +105,12 @@ ln -s ../ac.service %{buildroot}/%{_unitdir}/graphical.target.wants/ac.service %endif %preun -if [ $1 == 0 ]; then %if !%{with multi_user} +if [ $1 == 0 ]; then systemctl stop launchpad-preload@app.service systemctl stop ac.service -%endif fi +%endif %post /sbin/ldconfig @@ -122,7 +122,8 @@ if [ $1 == 1 ]; then fi %endif -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig %if !%{with multi_user} systemctl daemon-reload %endif -- 2.7.4