rpm/nut
SHA256
1
0
Fork 0
forked from pool/nut
Code Pull Requests Activity

Accepting request 141617 from home:a_jaeger:FactoryFix

Browse Source 
Fix useradd invocation.

OBS-URL: https://build.opensuse.org/request/show/141617
OBS-URL: https://build.opensuse.org/package/show/hardware/nut?expand=0&rev=35
This commit is contained in:
Andreas Jaeger
2012-11-17 10:52:55 +00:00
committed by Git OBS Bridge
parent 5cb1b61760
commit c793d22745
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nut.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 17 09:54:35 UTC 2012 - aj@suse.de
- Fix useradd invocation: -o is useless without -u and newer
versions of pwdutils/shadowutils fail on this now.
- Fix provides/obsoletes
-------------------------------------------------------------------
Tue Sep 4 12:06:57 CEST 2012 - sbrabec@suse.cz

8
nut.spec
View File

@@ -75,9 +75,9 @@ Requires: powersave
Requires: usbutils
Requires(post): udev
# for update from openSUSE <= 11.3, SLE <= 11
Provides: nut-classic <= %{version}
Obsoletes: nut-classic <= %{version}
Obsoletes: nut-hal <= %{version}
Provides: nut-classic = %{version}
Obsoletes: nut-classic < %{version}
Obsoletes: nut-hal < %{version}
%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX)
%define CGIPATH %{apache_serverroot}/cgi-bin
%define HTMLPATH %{apache_serverroot}/htdocs
@@ -259,7 +259,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d
install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/
%pre
usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \
usr/sbin/useradd -r -g %{GROUP} -s /bin/false \
-c "UPS daemon" -d /sbin %{USER} 2>/dev/null || :
%post