[icewm/el6] - EL6 support.

Gilboa Davara gilboa at fedoraproject.org
Mon Jul 25 16:12:53 UTC 2011


commit 3e622c411fe4e7d7b251ba7c6a3b106b87dae450
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Mon Jul 25 19:12:35 2011 +0300

    - EL6 support.

 icewm.spec |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)
---
diff --git a/icewm.spec b/icewm.spec
index a49036a..eac266d 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,8 +1,18 @@
 Name:			icewm
 Version:		1.2.37
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Light and configurable window manager
 
+%if 0%{?rhel} != 0
+%if %{?rhel} <= 5
+%define new_version	0
+%else
+%define new_version	1
+%endif
+%else
+%define new_version 1
+%endif
+
 Group:			User Interface/Desktops
 License:		LGPLv2+
 URL:			http://www.icewm.org
@@ -12,13 +22,6 @@ Source2:		icewm.desktop
 Source3:		icewm-startup
 Source4:		clearlooks.tgz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 8
-BuildRequires:	popt-devel
-Requires:		bluecurve-icon-theme
-%else
-BuildRequires:	popt
-Requires:		redhat-artwork
-%endif
 
 BuildRequires:	giflib-devel
 BuildRequires:	libXinerama-devel
@@ -30,19 +33,27 @@ BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	fribidi-devel
-%if 0%{?fedora} > 10
+
+%if %{new_version} == 1
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
-%endif
-%if 0%{?fedora} < 9
-Requires:		xorg-x11-fonts-truetype
-Requires:		htmlview
+BuildRequires:	popt-devel
 %else
-Requires:		xdg-utils
+BuildRequires:	popt
 %endif
+
 Requires:		alsa-utils
 Requires:		xterm
 
+%if %{new_version} == 1
+Requires:		bluecurve-icon-theme
+Requires:		xdg-utils
+%else
+Requires:		xorg-x11-fonts-truetype
+Requires:		htmlview
+Requires:		redhat-artwork
+%endif
+
 Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
@@ -207,6 +218,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 25 2011 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-9
+- EL6 support.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Jan 22 2010 Gilboa Davara <gilboa[AT]gmail.com> - 1.2.37-7
 - Fix missing backspace.
 - Fix duplicate clearlooks theme. (#545268)


More information about the scm-commits mailing list