[bind-to-tinydns/el5: 12/13] Merge branch 'master' into el5

[Tim Jackson]

commit 5fc192a96b3a6bf99a9ccc52d1a4e2b25585564a
Merge: 109eea5 b2c2a43
Author: Tim Jackson <rpm at timj.co.uk>
Date:   Wed Feb 5 20:04:51 2014 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	bind-to-tinydns.spec
    	sources

 .gitignore           |    1 -
 bind-to-tinydns.spec |   12 ++++++++----
 sources              |    4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --cc bind-to-tinydns.spec
index 9e28549,6c2f396..fdcd842
--- a/bind-to-tinydns.spec
+++ b/bind-to-tinydns.spec
@@@ -1,14 -1,13 +1,14 @@@
  Name:           bind-to-tinydns
  Version:        0.4.3
- Release:        4%{?dist}
 -Release:        12.20140205git32dc9263%{?dist}
++Release:        5.20140205git32dc9263%{?dist}
  Summary:        Convert DNS zone files in BIND format to tinydns format
  
  Group:          Applications/System
- License:        GPL+
+ License:        BSD
  URL:            http://www.erat.org/
- Source0:        http://www.erat.org/files/bind-to-tinydns-%{version}.tar.gz
+ Source0:        bind-to-tinydns-%{version}-20140205git32dc9263.tar.bz2
  Patch0:         bind-to-tinydns-0.4.3-cflags.patch
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
  This is a program that parses zone files used by the BIND DNS server and
@@@ -39,6 -38,31 +39,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Wed Feb 05 2014 Tim Jackson <rpm at timj.co.uk>
++* Wed Feb 05 2014 Tim Jackson <rpm at timj.co.uk> 0.4.3-5.20140205git32dc9263
+ - Updated to latest upstream snapshot; supports AAAA records
+ - License is now BSD
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-11
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-10
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-9
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-8
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
  * Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-4
  - Compile stage now uses standard compiler flags
  
diff --cc sources
index 1353263,cabf3e2..08ce221
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +92657532ac03c439c85156554351b154  bind-to-tinydns-0.4.3.tar.gz
++=======
+ bf4c6e027344fbab77e7cae9074a8a50  bind-to-tinydns-0.4.3-20140205git32dc9263.tar.bz2
++>>>>>>> master