rpms/icewm/F-7 icewm.spec,1.4,1.5

[Gilboa Davara (gilboa)]

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21578

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:34 -0000	1.4
+++ icewm.spec	1 Sep 2007 08:26:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,12 +11,10 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
 BuildRequires:	imlib-devel
@@ -136,6 +134,12 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.