rpms/dhcp-forwarder/FC-3 dhcp-forwarder-0.7-bigend.patch, NONE, 1.1 dhcp-forwarder.spec, 1.5, 1.6
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Fri Jun 3 09:11:48 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/dhcp-forwarder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26686
Modified Files:
dhcp-forwarder.spec
Added Files:
dhcp-forwarder-0.7-bigend.patch
Log Message:
merged with FC-4 branch
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/FC-3/dhcp-forwarder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcp-forwarder.spec 2 Feb 2005 21:37:56 -0000 1.5
+++ dhcp-forwarder.spec 3 Jun 2005 09:11:46 -0000 1.6
@@ -5,37 +5,40 @@
## --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}
-Summary: A DHCP relay agent
+%{!?release_func:%global release_func() %1%{?dist}}
+
+Summary: DHCP relay agent
Name: dhcp-forwarder
Version: 0.7
-Release: %release_func 1
-Epoch: 0
+Release: %release_func 4
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)
+Requires: init(dhcp-forwarder)
%{!?_without_dietlibc:BuildRequires: dietlibc}
@@ -50,7 +53,7 @@
Summary: SysV initscripts for dhcp-forwarder
Group: System Environment/Base
Provides: init(dhcp-forwarder) = sysv
-Requires: %name = %epoch:%version-%release
+Requires: %name = %version-%release
Requires(preun): %name initscripts
Requires(postun): %name initscripts
Requires(post): /sbin/chkconfig
@@ -61,7 +64,7 @@
Summary: minit initscripts for dhcp-forwarder
Group: System Environment/Base
Provides: init(dhcp-forwarder) = minit
-Requires: %name = %epoch:%version-%release
+Requires: %name = %version-%release
Requires(pre): minit-setup
Requires(postun): minit-setup
@@ -95,26 +98,20 @@
with the minit initconcept.
-##---------------------------------------------
-
%prep
%setup -q
-
-
-##---------------------------------------------
+%patch0 -p0
%build
%configure \
--enable-release \
- --with-initrddir=%_initrddir \
+ --with-initrddir=%_initrddir \
%{?_without_dietlibc:--disable-dietlibc}
%__make %{?_smp_mflags}
-##---------------------------------------------
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -125,15 +122,11 @@
%{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
-##---------------------------------------------
-
%check
%__make check
-##---------------------------------------------
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -141,8 +134,8 @@
%pre
%groupadd -r %username &>/dev/null || :
-%useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
- -d %homedir -g %username %username &>/dev/null || :
+%useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+ -d %homedir -g %username %username &>/dev/null || :
%postun
@@ -162,7 +155,7 @@
fi
%postun sysv
-test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
%files
@@ -197,6 +190,13 @@
%changelog
+* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-4
+- use %%dist instead of %%disttag
+
+* 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
@@ -254,5 +254,5 @@
* Thu Jun 13 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.1-0.3
- Added --without dietlibc option
-* Sat Jun 1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+* Sat Jun 1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
- Initial build.
More information about the fedora-extras-commits
mailing list