rpms/dnsmasq/FC-5 dnsmasq-2.35-conf-dir.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.6, 1.7
Patrick Laughton (jima)
fedora-extras-commits at redhat.com
Mon Nov 6 18:59:50 UTC 2006
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6480
Modified Files:
dnsmasq.spec sources
Added Files:
dnsmasq-2.35-conf-dir.patch
Log Message:
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
dnsmasq-2.35-conf-dir.patch:
--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
# Include a another lot of configuration options.
#conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dnsmasq.spec 24 Oct 2006 16:39:09 -0000 1.8
+++ dnsmasq.spec 6 Nov 2006 18:59:20 -0000 1.9
@@ -1,5 +1,5 @@
Name: dnsmasq
-Version: 2.34
+Version: 2.35
Release: 2%{?dist}
Summary: A lightweight DHCP/caching DNS server
@@ -9,6 +9,7 @@
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
%if "%fedora" > "3" || "%aurora" > "2"
%patch1 -p1
%endif
+%patch2 -p1
%build
make %{?_smp_mflags}
@@ -49,7 +51,7 @@
# normally i'd do 'make install'...it's a bit messy, though
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
$RPM_BUILD_ROOT%{_mandir}/man8 \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -78,8 +80,9 @@
%files
%defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
%if "%fedora" > "3" || "%aurora" > "2"
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%endif
@@ -89,6 +92,16 @@
%changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Oct 2006 18:19:48 -0000 1.6
+++ sources 6 Nov 2006 18:59:20 -0000 1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz
More information about the scm-commits
mailing list