rpms
/
dnsmasq
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Implementing request from upstream, unified spec, etc

This commit is contained in:
Patrick Laughton 2006-04-27 15:16:45 +00:00
parent b0365fbe30
commit 9433ece76b
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dnsmasq-2.30-enable-dbus.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h 2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h 2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
/* platform independent options- uncomment to enable */
/* #define HAVE_BROKEN_RTC */
/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

12
dnsmasq-2.30-initscript.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
#
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid

19
dnsmasq.spec
View File

@ -1,16 +1,19 @@
Name: dnsmasq
Version: 2.30
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPL
URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-extras.patch
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{dist}" != ".fc3"
BuildRequires: dbus-devel
%endif
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
@ -31,6 +34,9 @@ machines.
%prep
%setup -q
%patch0 -p1
%if "%{dist}" != ".fc3"
%patch1 -p1
%endif
%build
make %{?_smp_mflags}
@ -74,10 +80,15 @@ fi
%changelog
* Mon Apr 24 2006 Patrick Laughton <jima@auroralinux.org> 2.30-2
* Thu Apr 27 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-3
- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
- Split initscript & enable-dbus patches, conditionalized dbus for FC3
- Tweaked name field in changelog entries (trying to be consistent)
* Mon Apr 24 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel
* Mon Apr 24 2006 Patrick Laughton <jima@auroralinux.org> 2.30-1
* Mon Apr 24 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-1
- Initial Fedora Extras RPM