From 7f8848cd09e25a9a5e9bd724410910c6714451e9 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 10 2016 14:06:53 +0000
Subject: Add subpackages for OpenID Connect to the contrib spec file


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Paul Frields <stickster@gmail.com>

---

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index 73ed30e..8456522 100644
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -69,6 +69,7 @@ License:        GPLv3+
 Requires:       %{name}-filesystem = %{version}-%{release}
 Requires:       %{name}-saml2-base = %{version}-%{release}
 Requires:       mod_auth_mellon >= 0.11.0
+Requires:       mod_auth_openidc
 Requires:       mod_ssl
 BuildArch:      noarch
 
@@ -135,6 +136,20 @@ BuildArch:      noarch
 Provides an OpenId provider plugin for the Ipsilon identity Provider
 
 
+%package openidc
+Summary:        OpenID Connect provider plugin
+Group:          System Environment/Base
+License:        GPLv3+
+Provides:       ipsilon-provider = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-jwcrypto
+BuildArch:      noarch
+
+%description openidc
+Provides an OpenID Connect and OAuth2 provider plugin for the Ipsilon
+identity Provider
+
+
 %package persona
 Summary:        Persona provider plugin
 Group:          System Environment/Base
@@ -352,8 +367,14 @@ fi
 %{_datadir}/ipsilon/templates/saml2
 
 %files openid
-%{python2_sitelib}/ipsilon/providers/openid*
-%{_datadir}/ipsilon/templates/openid
+%{python2_sitelib}/ipsilon/providers/openidp.py*
+%{python2_sitelib}/ipsilon/providers/openid/
+%{_datadir}/ipsilon/templates/openid/
+
+%files openidc
+%{python2_sitelib}/ipsilon/providers/openidcp.py*
+%{python2_sitelib}/ipsilon/providers/openidc/
+%{_datadir}/ipsilon/templates/openidc/
 
 %files persona
 %{python2_sitelib}/ipsilon/providers/persona*
diff --git a/setup.py b/setup.py
index 794af43..c01aa70 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,8 @@ setup(
                 'ipsilon.providers', 'ipsilon.providers.saml2',
                 'ipsilon.providers.openid',
                 'ipsilon.providers.openid.extensions',
+                'ipsilon.providers.openidc',
+                'ipsilon.providers.openidc.plugins',
                 'ipsilon.providers.persona',
                 'ipsilon.tools', 'ipsilon.helpers',
                 'tests', 'tests.helpers'],
@@ -40,6 +42,7 @@ setup(
                   (DATA+'templates/login', glob('templates/login/*.html')),
                   (DATA+'templates/saml2', glob('templates/saml2/*.html')),
                   (DATA+'templates/openid', glob('templates/openid/*')),
+                  (DATA+'templates/openidc', glob('templates/openidc/*')),
                   (DATA+'templates/persona', glob('templates/persona/*.html')),
                   (DATA+'templates/install', glob('templates/install/*.conf')),
                   (DATA+'templates/install/pam',