Dominique Leuenberger 2015-01-07 08:38:17 +00:00 committed by Git OBS Bridge
commit 86c76718c6
2 changed files with 16 additions and 7 deletions

View File

@ -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 Mon Dec 29 09:37:54 UTC 2014 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package dnsmasq # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -69,16 +69,19 @@ server's leases.
dos2unix contrib/systemd/dbus_activation dos2unix contrib/systemd/dbus_activation
# SED-FIX-UPSTREAM -- Fix paths # SED-FIX-UPSTREAM -- Fix paths
sed -i -e 's|/usr/local|/usr|' \ sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|;
-i -e 's|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' Makefile s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
Makefile
# SED-FIX-UPSTREAM -- Fix man page # 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-FIX-UPSTREAM -- Fix cachesize, group and user
sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|' \ sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|;
-i -e 's|nobody|nogroup|' \ s|CHUSER "nobody"|CHUSER "dnsmasq"|;
-i -e 's|dip|dnsmasq|' src/config.h s|CHGRP "dip"|CHGRP "nogroup"|' \
src/config.h
%build %build
echo "#define HAVE_DBUS" >> src/config.h echo "#define HAVE_DBUS" >> src/config.h