From 53a2359ea96c0a1ba56bbc5a0322e9ea3cbad5c37959b0611e85ba5e3aa0a39e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 14 Nov 2012 09:18:10 +0000
Subject: [PATCH] Accepting request 141246 from GNOME:Next

useradd -o without -u is bogus

OBS-URL: https://build.opensuse.org/request/show/141246
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=92
---
 avahi-glib2.spec | 2 +-
 avahi-mono.spec  | 2 +-
 avahi-qt4.spec   | 2 +-
 avahi.changes    | 6 ++++++
 avahi.spec       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index 3f0f217..9ab1ace 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -910,7 +910,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 %if %suse_version >= 1210
 %service_add_pre avahi-dnsconfd.service avahi-daemon.service
 %endif
diff --git a/avahi-mono.spec b/avahi-mono.spec
index bd7f98f..b3da2f6 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -909,7 +909,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 %if %suse_version >= 1210
 %service_add_pre avahi-dnsconfd.service avahi-daemon.service
 %endif
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index c5458ff..a21e34c 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -912,7 +912,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 %if %suse_version >= 1210
 %service_add_pre avahi-dnsconfd.service avahi-daemon.service
 %endif
diff --git a/avahi.changes b/avahi.changes
index 36ed62f..b0894aa 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 14 09:05:25 UTC 2012 - dimstar@opensuse.org
+
+- Fix useradd invocation: -o is useless without -u and newer
+  versions of pwdutils/shadowutils fail on this now.
+
 -------------------------------------------------------------------
 Tue Oct 16 11:37:56 UTC 2012 - coolo@suse.com
 
diff --git a/avahi.spec b/avahi.spec
index 8a494c9..24f98f6 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -912,7 +912,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 %if %suse_version >= 1210
 %service_add_pre avahi-dnsconfd.service avahi-daemon.service
 %endif