--- cauldron/xterm/current/SPECS/xterm.spec	2012/11/05 19:16:30	314475
+++ cauldron/xterm/current/SPECS/xterm.spec	2012/11/05 20:31:49	314476
@@ -1,17 +1,12 @@
-%define	Summary	The standard terminal emulator for the X Window System
-
-Summary:	%{Summary}
+Summary:	Standard terminal emulator for the X window system
 Name:		xterm
-Version:	282
+Version:	286
 Release:	%mkrel 1
 Source0:	ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 Source1:	ftp://invisible-island.net/xterm/%{name}-%{version}.tgz.asc
-Source11:	%{name}-16x16.png
-Source12:	%{name}-32x32.png
-Source13:	%{name}-48x48.png
 
 # from http://www.vim.org/scripts/script.php?script_id=1349, public domain
-Source20:   colortest.pl
+Source20:	colortest.pl
 
 Url:		http://invisible-island.net/xterm/
 License:	MIT
@@ -48,7 +43,9 @@
    --x-includes=%{_includedir}/freetype2 \
    --enable-luit \
    --enable-256-color \
-   --with-app-defaults=%{_libdir}/X11/app-defaults
+   --with-app-defaults=%{_libdir}/X11/app-defaults \
+   --with-icon-theme=hicolor \
+   --with-icondir=%{_datadir}/icons
 
 %make
 
@@ -72,28 +69,22 @@
 EOF
 
 mkdir -p %{buildroot}%{_datadir}/applications
-cat > %{buildroot}%{_datadir}/applications/%{_real_vendor}-%{name}.desktop << EOF
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Name=XTerm
+GenericName=Terminal
 Comment=%{Summary}
 Exec=%{name} -name Terminal
-Icon=xterm-terminal
+Icon=xterm-color
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=TerminalEmulator;System;Utility;
 EOF
 
-for xpm in xterm{-color_32x32,-color_48x48,_32x32,_48x48}.xpm; do
+for xpm in *xterm{-color_32x32,-color_48x48,_32x32,_48x48}.xpm; do
 	rm -f %{buildroot}%{_datadir}/pixmaps/$xpm
 done
-mkdir -p %{buildroot}%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps
-install -m 644 %{_sourcedir}/xterm-16x16.png \
-	%{buildroot}%{_iconsdir}/hicolor/16x16/apps/xterm-terminal.png
-install -m 644 %{_sourcedir}/xterm-32x32.png \
-	%{buildroot}%{_iconsdir}/hicolor/32x32/apps/xterm-terminal.png
-install -m 644 %{_sourcedir}/xterm-48x48.png \
-	%{buildroot}%{_iconsdir}/hicolor/48x48/apps/xterm-terminal.png
 
 %post
 update-alternatives --install %{_bindir}/xvt xvt %{_bindir}/xterm 18 || :
@@ -106,5 +97,6 @@
 %{_bindir}/*
 %{_mandir}/*/*
 %{_libdir}/X11/app-defaults/*
-%{_datadir}/applications/%{_real_vendor}-%{name}.desktop
-%{_iconsdir}/hicolor/*/apps/xterm-terminal.png
+%{_datadir}/applications/%{name}.desktop
+%{_iconsdir}/hicolor/*/apps/xterm-*.*
+#%{_datadir}/pixmaps/*xterm.xpm