From 2cdf951440930732ee9a7b82604b1255e540e898 Mon Sep 17 00:00:00 2001
From: Oliver Keeble <oliver.keeble@cern.ch>
Date: May 14 2018 08:43:15 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/.gitignore b/.gitignore
index ad4c2ba..4d5de89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /dynafed-1.2.5.tar.gz
 /dynafed-1.3.0.tar.gz
 /dynafed-1.3.1.tar.gz
+/dynafed-1.3.2.tar.gz
diff --git a/dynafed.spec b/dynafed.spec
index 73f171c..b518364 100644
--- a/dynafed.spec
+++ b/dynafed.spec
@@ -13,15 +13,15 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:				dynafed
-Version:			1.3.1
+Version:			1.3.2
 Release:			1%{?dist}
 Summary:			Ultra-scalable dynamic system for federating HTTP-based storage resources
 Group:				Applications/Internet
 License:			ASL 2.0
 URL:				https://svnweb.cern.ch/trac/lcgdm/wiki
-# svn export http://svn.cern.ch/guest/lcgdm/ugr/trunk ugr
+# svn export http://svn.cern.ch/guest/lcgdm/ugr/tags/dynafed_1_3_2 dynafed-1.3.2
+# tar -czvf dynafed-1.3.2.tar.gz dynafed-1.3.2
 Source0:			http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:			%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:			boost-devel >= 1.48.0
@@ -40,8 +40,13 @@ BuildRequires:          libmaxminddb-devel
 BuildRequires:		libmemcached-devel
 BuildRequires:		openssl-devel
 BuildRequires:		protobuf-devel
+%if %{?fedora}%{!?fedora:0} >= 26
+BuildRequires:		python2
+BuildRequires:		python2-devel
+%else
 BuildRequires:		python
 BuildRequires:		python-devel
+%endif
 
 %if %systemd
 # possible deps to configure the journal for practical logging
@@ -217,6 +222,34 @@ make DESTDIR=%{buildroot} install
 /var/www/html/dashboard/*
 
 %changelog
+* Fri May 11 2018 Oliver Keeble <oliver.keeble@cern.ch> - 1.3.2-1
+- New upstream release
+
+* Mon Mar 26 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.3.1-10
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 29 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.3.1-8
+- Rebuild for protobuf 3.5
+
+* Mon Nov 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.1-7
+- Rebuild for protobuf 3.4
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 24 2017 Björn Esser <besser82@fedoraproject.org> - 1.3.1-3
+- Rebuilt for Boost 1.64
+
+* Tue Jun 13 2017 Orion Poplawski <orion@cora.nwra.com> - 1.3.1-2
+- Rebuild for protobuf 3.3.1
+
 * Tue May 30 2017 Andrea Manzi <amanzi at cern.ch> - 1.3.1-1
  - new upstream  release
 
diff --git a/sources b/sources
index 0527682..f293416 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dynafed-1.3.1.tar.gz) = f231961f599a635f98262366e84e7520687f8709d747b6b22a8363aa2794d90873ac2330de94facecf42851187615fc7c65fab096402d7888c5aa52855c0782e
+SHA512 (dynafed-1.3.2.tar.gz) = dba11970e61471aee012551917ab0a7a14bd63a93045f930072a4e545a82a83737c67a227785b488a48ba67986d51179f388004e5202055fc8d1786e39262454