- Latest Snapshot

- Fixed SRPM naming for EPEL7+

.gitignore

@@ -18,3 +18,5 @@
 /dnspython3-1.12.0GIT465785f.tar.gz
 /dnspython3-1.12.0GITa4774ee.tar.gz
 /dnspython-1.12.0GITa4774ee.tar.gz
+/dnspython3-1.12.0GIT99fd864.tar.gz
+/dnspython-1.12.0GIT99fd864.tar.gz

python-dns.spec

@@ -1,6 +1,6 @@
 
-%global py2commit a4774eea299e6a0ce01c074973dbddbe6fe20636
-%global py3commit 8d0fd8342089e66e199abe712ff22398bb7f736c
+%global py2commit 99fd864361a4e8f3988440b315d645e16bbf94b7
+%global py3commit 0473a04fdba32645f36220642192a35c30311e74
 
 # __python2 macro doesn't exist for el6
 %if 0%{?rhel} == 6
@@ -8,9 +8,11 @@
   %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %endif
 
-# Do not build python2 package for EPEL7+ since it's included in RHEL
 %if 0%{?epel} > 6
+  # Do not build python2 package for EPEL7+ since it's included in RHEL
   %global with_python2 0
+  # Rename source package so it doesn't conflict with RHEL source package
+  %global srpm_py_suffix 3
 %else
   %global with_python2 1
   %global py2prepdir %{_builddir}/dnspython/dnspython-%{py2commit}
@@ -36,8 +38,8 @@
   %global py3unpack -a 2
 %endif
 
-Name:           python-dns
-Version:        1.12.0GITa4774ee
+Name:           python%{?srpm_py_suffix}-dns
+Version:        1.12.0GIT99fd864
 Release:        1%{?dist}
 Summary:        DNS toolkit for Python
 
@@ -51,7 +53,6 @@ Source0:        https://github.com/rthalley/dnspython/archive/%{py2commit}.tar.g
 %endif
 
 %if 0%{?with_python3}
-# git snapshots are not on the web
 #Source2:        http://www.dnspython.org/kits3/%{version}/dnspython3-%{version}.tar.gz
 Source2:        https://github.com/rthalley/dnspython/archive/%{py3commit}.tar.gz#/dnspython3-%{version}.tar.gz
 %endif
@@ -236,6 +237,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Mar 27 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.12.0GIT99fd864-1
+- Latest Snapshot
+- Fixed SRPM naming for EPEL7+
+
 * Fri Feb 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.12.0GITa4774ee-1
 - Latest Snapshot
 - Drop EPEL5 from master spec

sources

@@ -1,2 +1,2 @@
-c047615f365ae02fee7dd3f547733933  dnspython3-1.12.0GITa4774ee.tar.gz
-bd195ac266869108f3bda2ceff122211  dnspython-1.12.0GITa4774ee.tar.gz
+13eb56cdb03a2bbef3b14b4f07aa0c21  dnspython3-1.12.0GIT99fd864.tar.gz
+9e5260494d865d43d05ec51c42e1fecd  dnspython-1.12.0GIT99fd864.tar.gz