From dd38cc0c120171a2cd3fbacbfd97436113470d38b5710ab174f369043fe298bc Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 14 Jan 2010 15:36:26 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/dhcp revision
 29.0

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=d9d45b1374eb0345c1355a2525581ad3
---
 dhcp.changes |  6 ++++++
 dhcp.spec    | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dhcp.changes b/dhcp.changes
index dbdbdf7..aede6ef 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  7 20:41:13 CET 2010 - jengelh@medozas.de
+
+- Enable parallel building
+- Use large PIE model on all SPARC flavors
+
 -------------------------------------------------------------------
 Mon Dec 14 22:39:01 CET 2009 - mt@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index 4cdeadd..da8b0aa 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dhcp (Version 3.1.3)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -27,11 +27,11 @@ Name:           dhcp
 BuildRequires:  CASA-devel
 %endif
 BuildRequires:  dos2unix openldap2-devel
-License:        BSD3c
+License:        BSD3c(or similar)
 Group:          Productivity/Networking/Boot/Servers
 AutoReqProv:    on
 Version:        3.1.3
-Release:        1
+Release:        2
 Summary:        Common Files Used by ISC DHCP Software
 Url:            http://www.isc.org/isc/dhcp.html
 Source0:        dhcp-%{version}.tar.bz2
@@ -88,7 +88,7 @@ PreReq:         /bin/touch /sbin/chkconfig sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package server
-License:        BSD3c
+License:        BSD3c(or similar)
 Summary:        ISC DHCP Server
 Group:          Productivity/Networking/Boot/Servers
 Requires:       net-tools dhcp
@@ -97,7 +97,7 @@ Provides:       dhcp_server dhcp:/usr/sbin/dhcpd
 AutoReqProv:    on
 
 %package client
-License:        BSD3c
+License:        BSD3c(or similar)
 Summary:        ISC DHCP Client
 Group:          Productivity/Networking/Boot/Clients
 Requires:       net-tools dhcp /usr/bin/host
@@ -107,7 +107,7 @@ Obsoletes:      dhclient
 AutoReqProv:    on
 
 %package relay
-License:        BSD3c ; "http://www.isc.org/products/DHCP/dhcp-copyright.html: ..."
+License:        BSD3c(or similar)
 Summary:        DHCP Relay Agent
 Group:          Productivity/Networking/Boot/Servers
 Requires:       net-tools dhcp
@@ -117,7 +117,7 @@ Obsoletes:      dhcrelay
 AutoReqProv:    on
 
 %package devel
-License:        BSD3c ; "http://www.isc.org/products/DHCP/dhcp-copyright.html: ..."
+License:        BSD3c(or similar)
 Summary:        Header Files and Libraries for dhcpctl API
 Group:          Development/Libraries/C and C++
 Requires:       dhcp = %{version}
@@ -235,7 +235,7 @@ CFLAGS="$RPM_OPT_FLAGS -W -Wall -fno-strict-aliasing -Wno-unused -DLDAP_DEPRECAT
   CFLAGS="$CFLAGS -fsigned-char"
 %endif
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
-%ifarch ia64 sparc64 alpha s390x ppc64 x86_64
+%ifarch ia64 %sparc alpha s390x ppc64 x86_64
   CFLAGS="$CFLAGS -fPIE" 
 %else
   CFLAGS="$CFLAGS -fpie" 
@@ -246,12 +246,12 @@ export DEBUG_FLAGS=$CFLAGS
 # first, build binaries which use bsd sockets instead of lpf
 cp includes/site.h includes/site.h.save.lpf
 echo "#define USE_SOCKETS" >> includes/site.h
-make DEBUG="$DEBUG_FLAGS -W" all
+make %{?_smp_mflags} DEBUG="$DEBUG_FLAGS -W" all
 cp -p work.linux-2.2/server/dhcpd work.linux-2.2/server/dhcpd.bsd
 make clean
 # then, build the normal binaries using lpf
 mv includes/site.h.save.lpf includes/site.h
-make DEBUG="$DEBUG_FLAGS -W" all 
+make %{?_smp_mflags} DEBUG="$DEBUG_FLAGS -W" all 
 # with a minimal config, see if it runs
 echo "ddns-update-style interim;" > testconf
 work.linux-2.2/server/dhcpd -t -cf testconf || exit 1