rpms/dhcp-forwarder/devel dhcp-forwarder-0.7-bigend.patch, NONE, 1.1 dhcp-forwarder.spec, 1.7, 1.8

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14461

Modified Files:
	dhcp-forwarder.spec 
Added Files:
	dhcp-forwarder-0.7-bigend.patch 
Log Message:
fixed bigendian builds (backported from 0.8)
s!%%define!%%global! to workaround bugs in rpm's macro-engine


dhcp-forwarder-0.7-bigend.patch:

--- NEW FILE dhcp-forwarder-0.7-bigend.patch ---
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.h,v 1.14 2004/06/22 10:46:56 ensc Exp $    --*- c++ -*--
+// $Id: dhcp.h,v 1.15 2004/12/23 00:49:01 ensc Exp $    --*- c++ -*--
 
 // Copyright (C) 2002 Enrico Scholz <enrico.scholz at 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
 };


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-forwarder.spec	5 Mar 2005 21:10:21 -0000	1.7
+++ dhcp-forwarder.spec	6 Mar 2005 21:55:23 -0000	1.8
@@ -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 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 
 %build
@@ -186,6 +190,10 @@
 
 
 %changelog
+* Sun Mar  6 2005 Enrico Scholz <enrico.scholz at 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 at informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
 - fedora'ized it