From 5b927c6e793242e0e6577ab3e23a2ee3c9e1a9ab Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Sep 15 2017 17:22:47 +0000
Subject: 1.3.28


---

diff --git a/690.patch b/690.patch
new file mode 100644
index 0000000..90cdc66
--- /dev/null
+++ b/690.patch
@@ -0,0 +1,31 @@
+From 452cf473923e68c9a530573f592f7e7d29922890 Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean@redhat.com>
+Date: Sep 15 2017 16:50:51 +0000
+Subject: Make ldap3 optional, to workaround packaging issues.
+
+
+---
+
+diff --git a/module_build_service/auth.py b/module_build_service/auth.py
+index 1b7c024..0c23729 100644
+--- a/module_build_service/auth.py
++++ b/module_build_service/auth.py
+@@ -38,12 +38,16 @@ try:
+ except ImportError:
+     from flask import _request_ctx_stack as stack
+ from werkzeug.exceptions import Unauthorized as FlaskUnauthorized
+-import ldap3
+ from dogpile.cache import make_region
+ 
+ from module_build_service.errors import Unauthorized, Forbidden
+ from module_build_service import app, log, conf
+ 
++try:
++    import ldap3
++except ImportError:
++    log.warn("ldap3 import not found.  ldap/krb disabled.")
++
+ 
+ client_secrets = None
+ region = make_region().configure('dogpile.cache.memory')
+
diff --git a/module-build-service.spec b/module-build-service.spec
index a23603e..48c067f 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -1,20 +1,23 @@
 Name:           module-build-service
-Version:        1.3.27
-Release:        3%{?dist}
+Version:        1.3.28
+Release:        1%{?dist}
 Summary:        The Module Build Service for Modularity
 
 Group:          Development/Tools
 License:        MIT
 URL:            https://pagure.io/fm-orchestrator
 Source0:        https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
+# https://pagure.io/fm-orchestrator/pull-request/690.patch
+Patch0:         690.patch
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# In EL7 we need flask which needs python-itsdangerous which comes from
-# rhel7-extras which is only available on x86_64 for now.
-ExclusiveArch:  %{ix86} x86_64
-%else
 BuildArch:      noarch
-%endif
+
+# Ralph -- I couldn't get the stuff below to work for me.  :(
+#%if 0%{?rhel} && 0%{?rhel} <= 7
+## In EL7 we need flask which needs python-itsdangerous which comes from
+## rhel7-extras which is only available on x86_64 for now.
+#ExclusiveArch:  %{ix86} x86_64
+#%endif
 
 BuildRequires:  python2-devel
 
@@ -40,6 +43,7 @@ BuildRequires:  rpm-build
 BuildRequires:  python-qpid
 BuildRequires:  python-openidc-client
 BuildRequires:  python-urlgrabber
+#BuildRequires:  python-ldap3
 
 BuildRequires:  python2-koji
 
@@ -104,6 +108,7 @@ Requires:       rpm-build
 Requires:       python-qpid
 Requires:       python-openidc-client
 Requires:       python-urlgrabber
+#Requires:       python-ldap3
 
 Requires:       python2-koji
 
@@ -167,11 +172,14 @@ rm -f module_build_service/scheduler/consumer.pyc
 # And this weird sqlite file that made it in...
 rm -f module_build_service/.mbs_local_build.db
 
+# XXX - Remove ldap3 until it is available for epel7
+%patch0 -p1
+sed -i '/ldap3/d' requirements.txt
+rm -f tests/test_auth.py
 
 %build
 %py2_build
 
-
 %install
 %py2_install
 
@@ -201,6 +209,8 @@ done
 %config(noreplace) %{_sysconfdir}/module-build-service/koji.conf
 %config(noreplace) %{_sysconfdir}/module-build-service/copr.conf
 %config(noreplace) %{_sysconfdir}/module-build-service/cacert.pem
+%config(noreplace) %{_sysconfdir}/module-build-service/mock.cfg
+%config(noreplace) %{_sysconfdir}/module-build-service/yum.conf
 %config(noreplace) %{_sysconfdir}/fedmsg.d/mbs-scheduler.py
 %config(noreplace) %{_sysconfdir}/fedmsg.d/mbs-logging.py
 %config(noreplace) %{_sysconfdir}/fedmsg.d/module_build_service.py
@@ -210,6 +220,9 @@ done
 %exclude %{python2_sitelib}/tests/
 
 %changelog
+* Fri Sep 15 2017 Ralph Bean <rbean@redhat.com> - 1.3.28-1
+- new version
+
 * Tue Sep 12 2017 Ralph Bean <rbean@redhat.com> - 1.3.27-3
 - Remove the nobuild patch for EL7.