rpms/dhcp-forwarder/devel sources, 1.2, 1.3 dhcp-forwarder.spec, 1.4, 1.5
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Wed Feb 2 21:37:58 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7207/devel
Modified Files:
sources dhcp-forwarder.spec
Log Message:
* Thu Nov 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
- fedora'ized it
* Thu Aug 19 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.6.1-0
- added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
* Thu Jun 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.6.1-0
- conditionalized build of -minit subpackage
* Thu Aug 7 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.5.1-0
- added minit support
- removed superfluous %%doc attribute of %%_mandir entries
- removed superfluous curlies
- use 'install-contrib' and cleaned up %%install section
- moved /etc/sysconfig/* file into -sysv subpackage; it is not used by
-minit anymore
- minor cleanups
* Wed Jul 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.5-0.fdr.1
- updated to version 0.5
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:13:44 -0000 1.2
+++ sources 2 Feb 2005 21:37:56 -0000 1.3
@@ -1 +1,2 @@
-bd8a9f616f9dad444c7449eda6b23baa dhcp-forwarder-0.4.tar.bz2
+e7f876e615ebc3f96418f6477b4451e2 dhcp-forwarder-0.7.tar.bz2
+590a4d8b227aaf125bba8258ca915677 dhcp-forwarder-0.7.tar.bz2.asc
Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dhcp-forwarder.spec 8 Nov 2004 04:15:20 -0000 1.4
+++ dhcp-forwarder.spec 2 Feb 2005 21:37:56 -0000 1.5
@@ -1,25 +1,70 @@
## $Id$ --*- rpm-spec -*--
+## This package understands the following switches:
+## --without dietlibc ... disable usage of dietlibc
+## --without minit ... disable creation of 'minit' subpackage
+## --with fedora ... enable fedora.us specific parts
+
+%define _with_fedora 1
+%define _without_minit 1
+
+
+%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
+
+
%define username dhcp-fwd
-%define homedir %{_var}/lib/%{username}
+%define homedir %_var/lib/%username
+%define minitdir %_sysconfdir/minit
+%define minitsvcdir %minitdir/services/dhcp-fwd
+%define service dhcp-fwd
+
+%{!?release_func:%define release_func() %1}
Summary: A DHCP relay agent
Name: dhcp-forwarder
-Version: 0.4
-Release: 0.fdr.2.2
+Version: 0.7
+Release: %release_func 1
Epoch: 0
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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
-Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
-Requires(post,preun): /sbin/chkconfig
+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
+BuildRoot: %_tmppath/%name-%version-%release-root
+Requires: init(dhcp-forwarder)
+
+%{!?_without_dietlibc:BuildRequires: dietlibc}
+
+## The Requires(...) which depend on the '--with fedora' switch
+%{!?_with_fedora:Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd}
+%{!?_with_fedora:Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel}
+%{?_with_fedora:Requires(pre): fedora-usermgmt}
+%{?_with_fedora:Requires(postun): fedora-usermgmt}
+
+
+%package sysv
+Summary: SysV initscripts for dhcp-forwarder
+Group: System Environment/Base
+Provides: init(dhcp-forwarder) = sysv
+Requires: %name = %epoch:%version-%release
+Requires(preun): %name initscripts
+Requires(postun): %name initscripts
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
+
+%package minit
+Summary: minit initscripts for dhcp-forwarder
+Group: System Environment/Base
+Provides: init(dhcp-forwarder) = minit
+Requires: %name = %epoch:%version-%release
+Requires(pre): minit-setup
+Requires(postun): minit-setup
-%if %{?_without_dietlibc:0}%{!?_without_dietlibc:1}
-BuildRequires: dietlibc
-%endif
%description
@@ -34,26 +79,60 @@
* Has a small memory footprint when using dietlibc
+%description sysv
+dhcp-fwd forwards DHCP messages between subnets with different sublayer
+broadcast domains.
+
+This package provides the scripts which can be used to start dhcp-forwarder
+with the SysV initconcept.
+
+
+%description minit
+dhcp-fwd forwards DHCP messages between subnets with different sublayer
+broadcast domains.
+
+This package provides the scripts which can be used to start dhcp-forwarder
+with the minit initconcept.
+
+
+##---------------------------------------------
+
+
%prep
%setup -q
+##---------------------------------------------
+
+
%build
-%configure --enable-release %{?_without_dietlibc:--disable-dietlibc}
-%{__make} %{?_smp_mflags}
-%{__make} check
+%configure \
+ --enable-release \
+ --with-initrddir=%_initrddir \
+ %{?_without_dietlibc:--disable-dietlibc}
+%__make %{?_smp_mflags}
+
+
+##---------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install
+%__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
+%__install -d -m700 $RPM_BUILD_ROOT%homedir
+
+%{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
+
+
+##---------------------------------------------
-%{__install} -d ${RPM_BUILD_ROOT}{%{_sysconfdir}/sysconfig,%{_initrddir}}
-%{__install} -p -m755 contrib/dhcp-fwd.init ${RPM_BUILD_ROOT}%{_initrddir}/dhcp-fwd
-%{__install} -p -m644 contrib/dhcp-fwd.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dhcp-fwd
-%{__install} -p -m644 contrib/dhcp-fwd.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
-%{__install} -d -m700 ${RPM_BUILD_ROOT}%{homedir}
+
+%check
+%__make check
+
+
+##---------------------------------------------
%clean
@@ -61,44 +140,84 @@
%pre
-/usr/sbin/groupadd -r %{username} &>/dev/null || :
-/usr/sbin/useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
- -d %{homedir} -g %{username} %{username} &>/dev/null || :
+%groupadd -r %username &>/dev/null || :
+%useradd -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+ -d %homedir -g %username %username &>/dev/null || :
-%post
-/sbin/chkconfig --add dhcp-fwd
-%preun
+%postun
if test "$1" = "0"; then
- %{_initrddir}/dhcp-fwd stop >/dev/null
- /sbin/chkconfig --del dhcp-fwd
+ %userdel %username &>/dev/null || :
+ %groupdel %username &>/dev/null || :
fi
-%postun
+
+%post sysv
+/sbin/chkconfig --add %service
+
+%preun sysv
if test "$1" = "0"; then
- /usr/sbin/userdel %{username} &>/dev/null || :
- /usr/sbin/groupdel %{username} &>/dev/null || :
-elif test "$1" -ge 1; then
- %{_initrddir}/dhcp-fwd condrestart >/dev/null
+ %_initrddir/%service stop >/dev/null
+ /sbin/chkconfig --del %service
fi
+%postun sysv
+test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%doc %{_mandir}/*/*
-%config %{_initrddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-%config(noreplace) %{_sysconfdir}/dhcp-fwd.conf
-%{_sbindir}/*
+%_mandir/*/*
+%config(noreplace) %_sysconfdir/dhcp-fwd.conf
+%_sbindir/*
## *DO NOT* add %defattr(-,dhcp-fwd,dhcp-fwd); the homedir is used for
## the chroot() only and there is no reason why the setuid()'ed daemon
## needs any kind of access there
-%{homedir}
+%homedir
+
+
+%files sysv
+%defattr(-,root,root,-)
+%config %_initrddir/*
+%config(noreplace) %_sysconfdir/sysconfig/*
+
+
+%if 0%{!?_without_minit:1}
+
+%files minit
+%defattr(-,root,root,-)
+%dir %minitsvcdir
+%minitsvcdir/run
+%minitsvcdir/respawn
+%config(noreplace) %minitsvcdir/params
+
+%endif
%changelog
+* Thu Nov 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
+- fedora'ized it
+
+* Thu Aug 19 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.6.1-0
+- added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
+
+* Thu Jun 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.6.1-0
+- conditionalized build of -minit subpackage
+
+* Thu Aug 7 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.5.1-0
+- added minit support
+- removed superfluous %%doc attribute of %%_mandir entries
+- removed superfluous curlies
+- use 'install-contrib' and cleaned up %%install section
+- moved /etc/sysconfig/* file into -sysv subpackage; it is not used by
+ -minit anymore
+- minor cleanups
+
+* Wed Jul 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.5-0.fdr.1
+- updated to version 0.5
+
* Tue May 27 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4-0.fdr.2
- create and remove group explicitely
- s/adduser/useradd/
@@ -106,7 +225,7 @@
the %%post/%%preun scriptlets directly
- do not call '--install-contrib' anymore; it creates too much
clutter to make sure that the initscripts will be installed into
- %%{_initrddir} but not in /etc/init.d. Instead of, install the
+ %%_initrddir but not in /etc/init.d. Instead of, install the
scripts manually.
* Fri May 2 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4-0.fdr.1
@@ -127,7 +246,7 @@
- Enhanced %postun script
* Mon Jun 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.2-2
-- Described purpose of the %%{homedir} and its handling
+- Described purpose of the %%homedir and its handling
* Fri Jun 14 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.2-1
- Added manpage
More information about the fedora-extras-commits
mailing list