From fee64a2aaaa2e092c053698c4af1c6ae0bdbd7d32a3c0ce402fa4edc900c4b14 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 6 Jan 2015 10:58:42 +0000
Subject: [PATCH] Accepting request 280028 from home:jirislaby:branches:network

better msg

OBS-URL: https://build.opensuse.org/request/show/280028
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=70
---
 dnsmasq.changes |  6 ++++++
 dnsmasq.spec    | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dnsmasq.changes b/dnsmasq.changes
index 2b463b9..388e321 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan  6 09:58:25 UTC 2015 - jslaby@suse.com
+
+- The change from Wed Dec 24 messed group w/ user IDs. Switch them
+  back and be more careful w/ what is changed.
+
 -------------------------------------------------------------------
 Mon Dec 29 09:37:54 UTC 2014 - dimstar@opensuse.org
 
diff --git a/dnsmasq.spec b/dnsmasq.spec
index ddebb04..2160b2a 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -69,16 +69,19 @@ server's leases.
 dos2unix contrib/systemd/dbus_activation
 
 # SED-FIX-UPSTREAM -- Fix paths
-sed -i -e 's|/usr/local|/usr|' \
-    -i -e 's|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' Makefile
+sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|;
+	   s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
+	Makefile
 
 # SED-FIX-UPSTREAM -- Fix man page
-sed -i 's|world readable.|world readable. The defaults are to "nogroup"|' man/dnsmasq.8
+sed -i -e 's|The defaults to "dip",|The default is "nogroup",|' \
+	man/dnsmasq.8
 
 # SED-FIX-UPSTREAM -- Fix cachesize, group and user
-sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|' \
-    -i -e 's|nobody|nogroup|' \
-    -i -e 's|dip|dnsmasq|' src/config.h
+sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|;
+	   s|CHUSER "nobody"|CHUSER "dnsmasq"|;
+	   s|CHGRP "dip"|CHGRP "nogroup"|' \
+	src/config.h
 
 %build
 echo "#define HAVE_DBUS" >> src/config.h