rpms/icewm/EL-5 icewm.spec,1.7,1.8 sources,1.5,1.6

[Gilboa Davara]

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11477

Modified Files:
	icewm.spec sources 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/icewm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- icewm.spec	14 Jan 2008 17:19:50 -0000	1.7
+++ icewm.spec	16 Jul 2009 11:49:15 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			icewm
-Version:		1.2.35
+Version:		1.2.37
 Release:		1%{?dist}
 Summary:		Light and configurable window manager
 
@@ -9,7 +9,8 @@ URL:			http://www.icewm.org
 Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Source1:		http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
 Source2:		icewm.desktop
-Source4:		icewm-startup
+Source3:		icewm-startup
+Source4:		clearlooks.tgz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
@@ -28,9 +29,17 @@ BuildRequires:	libXft-devel
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+%if 0%{?fedora} > 10
+BuildRequires:	libgnomeui-devel
+BuildRequires:	gnome-vfs2-devel
+%endif
+%if 0%{?fedora} < 9
 Requires:		xorg-x11-fonts-truetype
-Requires:		alsa-utils
 Requires:		htmlview
+%else
+Requires:		xdg-utils
+%endif
+Requires:		alsa-utils
 Requires:		xterm
 
 Patch0:			icewm-configure.patch
@@ -51,8 +60,6 @@ Requires:		gnome-menus
 Requires:		icewm = %{version}-%{release}
 
 
-
-
 %description	gnome
 IceWM-gnome adds gnome-menu support for the IceWM window manager.
 
@@ -70,6 +77,18 @@ freedesktop.org .desktop files. Files ar
 user logs-in.
 
 
+%package		clearlooks
+Summary:		Clearlooks like theme for IceWM
+Group:			User Interface/Desktops
+Requires:		ImageMagick
+Requires:		icewm = %{version}-%{release}
+
+
+%description	clearlooks
+An IceWM theme that mimics the GNOME ClearLooks theme used by
+older Fedora releases and RHEL.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .configure
@@ -98,11 +117,16 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
 
-%{__install} -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+%{__install} -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/
 %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/themes
+tar -C $RPM_BUILD_ROOT%{_datadir}/icewm/themes -xzf %{SOURCE4}
+
+echo "Theme=\"clearlooks/default.theme\"" > $RPM_BUILD_ROOT%{_datadir}/icewm/theme
+
 %find_lang %{name}
 
 
@@ -110,11 +134,44 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xse
 rm -rf $RPM_BUILD_ROOT
 
 
+%post clearlooks
+[ ! -z "$(cat /etc/issue | grep Fedora)" ] &&									\
+	[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&		\
+			convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png	\
+					/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+[ -z "$(cat /etc/issue | grep Fedora)" ] &&										\
+	[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&		\
+			convert /usr/share/pixmaps/redhat/shadowman-transparent-22.png		\
+					/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html
 %exclude %{_datadir}/icewm/startup
-%{_datadir}/icewm/
+%{_datadir}/icewm
+%{_datadir}/icewm/icons
+%{_datadir}/icewm/keys
+%{_datadir}/icewm/ledclock
+%{_datadir}/icewm/mailbox
+%{_datadir}/icewm/menu
+%{_datadir}/icewm/preferences
+%{_datadir}/icewm/startup
+%{_datadir}/icewm/taskbar  
+%{_datadir}/icewm/themes
+%{_datadir}/icewm/themes/gtk2
+%{_datadir}/icewm/themes/icedesert
+%{_datadir}/icewm/themes/Infadel2
+%{_datadir}/icewm/themes/metal2
+%{_datadir}/icewm/themes/motif
+%{_datadir}/icewm/themes/nice
+%{_datadir}/icewm/themes/nice2
+%{_datadir}/icewm/themes/warp3
+%{_datadir}/icewm/themes/warp4
+%{_datadir}/icewm/themes/win95
+%{_datadir}/icewm/themes/yellowmotif
+%{_datadir}/icewm/toolbar
+%{_datadir}/icewm/winoptions
 %{_datadir}/xsessions/icewm.desktop
 %{_mandir}/man1/icewm.1*
 %{_bindir}/icewmbg
@@ -137,7 +194,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icewm/startup
 
 
+%files clearlooks
+%defattr(-,root,root,-)
+%{_datadir}/icewm/themes/clearlooks
+%{_datadir}/icewm/theme
+
+
 %changelog
+* Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
+- 1.2.37.
+- Fix missing directory ownership. (#483346)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.36-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 6 2009 Caolán McNamara <caolanm at redhat.com> - 1.2.36-3
+- pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include
+  libgnomeui-2.0 anymore, so add it in explicitly
+
+* Mon Jan 5 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-2
+- Missing BR libgnomeui-devel. (devel)
+- Missing BR gnome-vfs2-devel. (devel)
+
+* Thu Jan 24 2008 <gilboad[AT]gmail.com> - 1.2.35-3
+- Fix broken -devel BR (truetype).
+
+* Sat Jan 19 2008 <gilboad[AT]gmail.com> - 1.2.35-2
+- Disable xorg-x11-fonts-truetype in -devel.
+
 * Mon Jan 14 2008 <gilboad[AT]gmail.com> - 1.2.35-1
 - 1.2.35.
 - Missing BR: xorg-x11-fonts-truetype. (#351811)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Jan 2008 17:19:50 -0000	1.5
+++ sources	16 Jul 2009 11:49:16 -0000	1.6
@@ -1 +1,2 @@
-a2adc53ab4c0c7ca6daa1ca4c697ffe9  icewm-1.2.35.tar.gz
+970a21588d26eb361020fd60a61a482c  icewm-1.2.37.tar.gz
+933ab5875707f9918d92f63d391630b0  clearlooks.tgz