From 13e7f0f9c6f838525c3997936cb3aa307bc69622 Mon Sep 17 00:00:00 2001
From: ensc <ensc@fedoraproject.org>
Date: Mar 06 2005 21:55:23 +0000
Subject: fixed bigendian builds (backported from 0.8) s!%%define!%%global! to

    workaround bugs in rpm's macro-engine

---

diff --git a/dhcp-forwarder-0.7-bigend.patch b/dhcp-forwarder-0.7-bigend.patch
new file mode 100644
index 0000000..17d1856
--- /dev/null
+++ b/dhcp-forwarder-0.7-bigend.patch
@@ -0,0 +1,23 @@
+Index: dhcp.h
+===================================================================
+RCS file: /home/cvs/dhcpfwd/src/dhcp.h,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -p -r1.14 -r1.15
+--- src/dhcp.h	22 Jun 2004 10:46:56 -0000	1.14
++++ src/dhcp.h	23 Dec 2004 00:49:01 -0000	1.15
+@@ -1,4 +1,4 @@
+-// $Id: dhcp-forwarder-0.7-bigend.patch,v 1.1 2005/03/06 21:55:23 ensc Exp $    --*- c++ -*--
++// $Id: dhcp-forwarder-0.7-bigend.patch,v 1.1 2005/03/06 21:55:23 ensc Exp $    --*- c++ -*--
+ 
+ // Copyright (C) 2002 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ //  
+@@ -89,7 +89,7 @@ enum {
+   optDHCP_COOKIE = 0x63538263u,
+   flgDHCP_BCAST	 = 0x0080u
+ #else
+-  DHCP_COOKIE  	 = 0x63825363u,
++  optDHCP_COOKIE = 0x63825363u,
+   flgDHCP_BCAST	 = 0x8000u
+ #endif
+ };
diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec
index 0f1ced7..572c5a6 100644
--- a/dhcp-forwarder.spec
+++ b/dhcp-forwarder.spec
@@ -5,34 +5,38 @@
 ## --without minit      ...   disable creation of 'minit' subpackage
 ## --with    fedora     ...   enable fedora.us specific parts
 
-%define _with_fedora	1
-%define _without_minit	1
+## Fedora Extras specific customization below...
+%{!?_without_fedora:%global	_with_fedora	--with fedora}
+%{!?_with_minit:%global		_without_minit	--without minit}
+##
 
 
-%define uid		11
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		11
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 
-%define	username	dhcp-fwd
-%define homedir		%_var/lib/%username
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/dhcp-fwd
-%define service		dhcp-fwd
+%global	username	dhcp-fwd
+%global homedir		%_var/lib/%username
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/dhcp-fwd
+%global service		dhcp-fwd
 
-%{!?release_func:%define release_func() %1}
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+Patch0:		dhcp-forwarder-0.7-bigend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(dhcp-forwarder)
 
@@ -97,7 +101,7 @@ with the minit initconcept.
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 
 %build
@@ -186,6 +190,10 @@ test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
 %changelog
+* Sun Mar  6 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.7-2
+- fixed bigendian builds (backported from 0.8)
+- s!%%define!%%global! to workaround bugs in rpm's macro-engine
+
 * Thu Nov 11 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
 - fedora'ized it