From bd2f4173b0133053b68e38671b0f1227629d89e9 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 2 Aug 2011 12:42:42 -0500
Subject: Fixed missing icons.

The Makefile.am and the spec file have been fixed to include all
icons in the install/ui folder.

Ticket #1559
---
 freeipa.spec.in        |   4 ++
 install/ui/Makefile.am | 108 +++++++++++++++++++++++++++----------------------
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index f148bb87c..5dda8116a 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -411,6 +411,7 @@ fi
 %{_usr}/share/ipa/ui/index.html
 %{_usr}/share/ipa/ui/*.png
 %{_usr}/share/ipa/ui/*.gif
+%{_usr}/share/ipa/ui/*.ico
 %{_usr}/share/ipa/ui/*.css
 %{_usr}/share/ipa/ui/*.js
 %{_usr}/share/ipa/ui/*.eot
@@ -513,6 +514,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Tue Aug 2 2011 Endi S. Dewata <edewata@redhat.com> - 2.0.90-10
+- Add *.ico files
+
 * Tue Jul 29 2011 Alexander Bokovoy <abokovoy@redhat.com> - 2.0.90-9
 - Add libipa_hbac-python dependency for hbactest plugin
 
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index 138db15ee..fa1fe855b 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -6,54 +6,76 @@ SUBDIRS =  				\
 	$(NULL)
 
 appdir = $(IPA_DATA_DIR)/ui
-app_DATA =                              \
+app_DATA =				\
 	aci.js				\
+	add-icon.png			\
 	add.js				\
+	arrow_collapsed.png		\
+	arrow_expanded.png		\
 	association.js			\
 	automount.js			\
 	background-center.png		\
 	background-left.png		\
 	background-right.png		\
 	caution.png			\
+	certificate.js 			\
 	check.png			\
+	combobox_open.png		\
+	consume.png			\
+	details.js 			\
 	dialog.js 			\
 	dns.js				\
-        facet-tab_on.png                \
-	facet-tab_off.png               \
-	ipa.js				\
-	ipa.css				\
-	json2.js			\
-	jquery.js			\
-	jquery-ui.js			\
-	jquery.ba-bbq.js		\
-	jquery-ui.css			\
-	jquery.ordered-map.js 		\
-	certificate.js 			\
 	entitle.js 			\
+	entity.js 			\
+	facet-tab_off.png		\
+	facet-tab_on.png		\
+	favicon.ico			\
 	group.js 			\
 	hbac.js 			\
 	host.js 			\
 	hostgroup.js 			\
+	hover-tab.png 			\
+	import.png 			\
 	index.html 			\
-	navigation.js			\
-	netgroup.js 			\
-	service.js 			\
-	serverconfig.js			\
-	sudo.js				\
-	policy.js			\
-	search.js 			\
-	rule.js 			\
-	details.js 			\
-	entity.js 			\
-	webui.js 			\
-	widget.js 			\
-	user.js 			\
-	ipalogo.png			\
+	ipa.css				\
+	ipa.js				\
 	ipabanner.png			\
+	ipalogo.png			\
+	jquery-ui.css			\
+	jquery-ui.js			\
+	jquery.ba-bbq.js		\
+	jquery.js			\
+	jquery.ordered-map.js 		\
+	json2.js			\
 	Mainnav-background.png		\
 	Mainnav-offtab.png  		\
 	Mainnav-ontab.png  		\
-        outer-bg.png			\
+	nav-arrow.png			\
+	navigation.js			\
+	netgroup.js 			\
+	outer-bg.png			\
+	overpass_bold-web.eot		\
+	overpass_bold-web.svg		\
+	overpass_bold-web.ttf		\
+	overpass_bold-web.woff		\
+	overpass_regular-web.eot	\
+	overpass_regular-web.svg	\
+	overpass_regular-web.ttf	\
+	overpass_regular-web.woff	\
+	policy.js			\
+	register.png			\
+	remove-icon.png			\
+	reset-icon.png			\
+	rule.js 			\
+	search-bg.png			\
+	search-icon.png			\
+	search.js 			\
+	serverconfig.js			\
+	service.js 			\
+	spinner_header.gif		\
+	spinner_small.gif		\
+	sudo.js				\
+	top-bg.png			\
 	ui-bg_flat_65_ffffff_40x100.png \
 	ui-bg_glass_40_111111_1x400.png \
 	ui-bg_glass_55_1c1c1c_1x400.png \
@@ -62,27 +84,17 @@ app_DATA =                              \
 	ui-bg_highlight-soft_50_aaaaaa_1x100.png \
 	ui-bg_inset-hard_45_cd0a0a_1x100.png \
 	ui-bg_inset-hard_55_ffeb80_1x100.png \
-	ui-bg_loop_8_333333_21x21.png \
-	ui-icons_222222_256x240.png \
-	ui-icons_4ca300_256x240.png \
-	ui-icons_bbbbbb_256x240.png \
-	ui-icons_ededed_256x240.png \
-	ui-icons_ffcf29_256x240.png \
-	ui-icons_ffffff_256x240.png \
-	add-icon.png \
-	overpass_bold-web.eot \
-	overpass_bold-web.svg \
-	overpass_bold-web.ttf \
-	overpass_bold-web.woff \
-	overpass_regular-web.eot \
-	overpass_regular-web.svg \
-	overpass_regular-web.ttf \
-	overpass_regular-web.woff \
-	remove-icon.png \
-	search-bg.png \
-	search-icon.png \
-	spinner_header.gif \
-	spinner_small.gif \
+	ui-bg_loop_8_333333_21x21.png	\
+	ui-icons_222222_256x240.png	\
+	ui-icons_4ca300_256x240.png	\
+	ui-icons_bbbbbb_256x240.png	\
+	ui-icons_ededed_256x240.png	\
+	ui-icons_ffcf29_256x240.png	\
+	ui-icons_ffffff_256x240.png	\
+	update-icon.png			\
+	user.js 			\
+	webui.js 			\
+	widget.js 			\
 	$(NULL)
 
 EXTRA_DIST =                            \
-- 
cgit