rpms/icewm/F-7 icewm.spec,1.2,1.3 sources,1.2,1.3

Gilboa Davara (gilboa) fedora-extras-commits at redhat.com
Sun Aug 26 14:29:17 UTC 2007


Author: gilboa

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

Modified Files:
	icewm.spec sources 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icewm.spec	9 Apr 2007 09:51:08 -0000	1.2
+++ icewm.spec	26 Aug 2007 14:28:44 -0000	1.3
@@ -1,10 +1,10 @@
 Name:			icewm
-Version:		1.2.30
-Release:		13%{?dist}
+Version:		1.2.32
+Release:		1%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
-License:		LGPL
+License:		LGPLv2
 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
@@ -12,6 +12,13 @@
 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
+BuildRequires:	popt-devel
+%endif
+
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -28,7 +35,6 @@
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
-Patch4:			icewm-1.2.30-apm-battery.patch
 
 
 %description
@@ -68,7 +74,6 @@
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
-%patch4 -p0 -b .apmbattery
 
 
 %build
@@ -131,38 +136,44 @@
 
 
 %changelog
-* Mon Apr 09 2007 <gilboad AT gmail DOT com> - 1.2.30-13
+* Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
+- Fixed license tag.
+- Fixed F8 BR - popt-devel.
+- Remove APMstatus fix.
+- 1.2.32
+
+* Mon Apr 09 2007 <gilboad[AT]gmail.com> - 1.2.30-13
 - APMStatus crash fix. (Icewm #1696182)
 
-* Sat Feb 10 2007 <gilboad AT gmail DOT com> - 1.2.30-12
+* Sat Feb 10 2007 <gilboad[AT]gmail.com> - 1.2.30-12
 - Add missing dot in the -gnome sub-package description.
 - Replace REQ icewm (in both -gnome and -xdgmenu) with icewm-x.x.x.
 - Fix -xdgmenu file list and %%install section.
 - Preserve the source time-stamp.
 
-* Sun Feb 04 2007 <gilboad AT gmail DOT com> - 1.2.30-11
+* Sun Feb 04 2007 <gilboad[AT]gmail.com> - 1.2.30-11
 - Remove .Xdefaults fix from startup. (reported upstream).
 - Replace buildroot with RPM_BUILD_ROOT.
 
-* Sun Jan 28 2007 <gilboad AT gmail DOT com> - 1.2.30-10
+* Sun Jan 28 2007 <gilboad[AT]gmail.com> - 1.2.30-10
 - Missing REQ: icewm (both -gnome and -xdgmenu)
 - Updated menu.in patch.
 - Updated startup script. (-xdgmenu)
 - Updated icewm-xdg-menu script. (-xdgmenu)
 
-* Thu Jan 25 2007 <gilboad AT gmail DOT com> - 1.2.30-9
+* Thu Jan 25 2007 <gilboad[AT]gmail.com> - 1.2.30-9
 - Remove redundant icewm-xdg-menu* %%file entry.
 - Change sub-package name to xdgmenu.
 - Move icewm-xdg-menu to xdgmenu sub-package.
 - Removed the icewm-generate-menu script.
 
-* Sat Jan 20 2007 <gilboad AT gmail DOT com> - 1.2.30-8
+* Sat Jan 20 2007 <gilboad[AT]gmail.com> - 1.2.30-8
 - Fix source1 URL. (2nd is a winner)
 - Fix -gnome summery.
 - New sub-package: icewm-xdg-menu
 - ALPHA: icewm-generate-menu script added to use icewm-xdg-menu to generate static menus.
 
-* Sat Jan 20 2007 <gilboad AT gmail DOT com> - 1.2.30-7
+* Sat Jan 20 2007 <gilboad[AT]gmail.com> - 1.2.30-7
 - Fix source1 URL.
 - Fix xdg-menu* owner.
 - Replace default terminal icon to reduce dep-chain.
@@ -171,7 +182,7 @@
 - Push -gnome's BR to main package.
 - Change hard-coded sysconf path.
 
-* Tue Jan 18 2007 <gilboad AT gmail DOT com> - 1.2.30-6
+* Tue Jan 18 2007 <gilboad[AT]gmail.com> - 1.2.30-6
 - Change license back to LGPL.
 - Change summery.
 - New sub-package: -gnome. (GNOME menu support.)
@@ -185,7 +196,7 @@
 - New REQ: eject. (keys)
 - New REQ: alsautils. (keys)
 
-* Wed Jan 17 2007 <gilboad AT gmail DOT com> - 1.2.30-5
+* Wed Jan 17 2007 <gilboad[AT]gmail.com> - 1.2.30-5
 - Fix Source0 URL.
 - Replace cp with install.
 - Do not gzip the man page, just copy it.
@@ -196,7 +207,7 @@
 - Add gdm session support.
 - Remove gnome-menus from default menu - replace it with pyxdg/icewm-xdg-menu.
 
-* Tue Jan 16 2007 <gilboad AT gmail DOT com> - 1.2.30-4
+* Tue Jan 16 2007 <gilboad[AT]gmail.com> - 1.2.30-4
 - Fix man page name.
 - Remove missing menu items.
 - Convert GNOME-menu patch to configure.in patch.
@@ -208,12 +219,12 @@
 - Fix missing gettext BR.
 - Fix missing lang support.
 
-* Sat Jan 13 2007 <gilboad AT gmail DOT com> - 1.2.30-3
+* Sat Jan 13 2007 <gilboad[AT]gmail.com> - 1.2.30-3
 - Fix wrong license. (Was LGPL, should be GPL.)
 
-* Tue Jan 11 2007 <gilboad AT gmail DOT com> - 1.2.30-2
+* Tue Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-2
 - Manually add missing man page.
 
-* Tue Jan 11 2007 <gilboad AT gmail DOT com> - 1.2.30-1
+* Tue Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-1
 - Initial release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
Binary files /tmp/cvs9Od361 and /tmp/cvswtqzHv differ




More information about the fedora-extras-commits mailing list