Merge pull request #9 from OSC/update/theme

Update dex theme

.gitignore

@@ -1,3 +1,3 @@
 *.tar.gz
-/packaging/theme.tar.gz
+/packaging/*.tar.gz
 /packaging/tmp

Makefile

@@ -1,4 +1,4 @@
 .PHONY: packaging
 
 packaging:
-	cd theme && tar czvf ../packaging/theme.tar.gz ./*
+	cd web && tar czvf ../packaging/web.tar.gz ./*

packaging/ondemand-dex.spec

@@ -18,9 +18,9 @@ License:    Apache-2.0
 URL:        https://github.com/dexidp/dex
 Source0:    https://github.com/dexidp/dex/archive/v%{version}.tar.gz
 Source1:    https://dl.google.com/go/go%{go_version}.linux-amd64.tar.gz
-Source2:    theme.tar.gz
+Source2:    web.tar.gz
 # Adds session support
-Source3:    https://github.com/OSC/dex/commit/b3fc3e6c2295c0af166803bdde0977ed170d1d40.patch
+Source5:    https://github.com/OSC/dex/commit/b3fc3e6c2295c0af166803bdde0977ed170d1d40.patch
 
 BuildRequires:  ondemand-scldevel
 BuildRequires:  systemd
@@ -46,7 +46,7 @@ GOPATH=$(go env GOPATH)
 cd $GOPATH/src/github.com/dexidp/dex/
 %__make bin/dex
 %__mv bin/dex bin/dex-orig
-%__patch -p1 < %{SOURCE3}
+%__patch -p1 < %{SOURCE5}
 %__make bin/dex
 %__mv bin/dex bin/dex-session
 %__mv bin/dex-orig bin/dex
@@ -60,10 +60,8 @@ cd $GOPATH/src/github.com/dexidp/dex/
 %__install -p -m 755 -D bin/dex-session %{buildroot}%{_sbindir}/%{name}-session
 %__install -p -m 600 -D examples/config-dev.yaml %{buildroot}%{confdir}/config.yaml
 touch %{buildroot}%{confdir}/dex.db
-%__mkdir_p %{buildroot}%{_datadir}/%{name}
-%__cp -R web %{buildroot}%{_datadir}/%{name}/web
-%__mkdir_p %{buildroot}%{_datadir}/%{name}/web/themes/ondemand
-%__tar -C %{buildroot}%{_datadir}/%{name}/web/themes/ondemand -xzf %{SOURCE2}
+%__mkdir_p %{buildroot}%{_datadir}/%{name}/web
+%__tar -C %{buildroot}%{_datadir}/%{name}/web -xzf %{SOURCE2}
 %__mkdir_p %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d
 %__cat >> %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/session.conf.example << EOF
 [Service]