SPECS: icewm.spec - up to 1.2.30 - -types.patch in sources - remov...

[twittner]

Author: twittner                     Date: Thu Jul 12 22:22:43 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.2.30
- -types.patch in sources - removed
- home_etc.patch needs its author attention (commented out)

---- Files affected:
SPECS:
   icewm.spec (1.202 -> 1.203) 

---- Diffs:

================================================================
Index: SPECS/icewm.spec
diff -u SPECS/icewm.spec:1.202 SPECS/icewm.spec:1.203
--- SPECS/icewm.spec:1.202	Mon Jun  4 22:00:25 2007
+++ SPECS/icewm.spec	Fri Jul 13 00:22:38 2007
@@ -9,7 +9,7 @@
 #
 # TODO:
 # - make a PLD-theme - default :]
-#
+# - -home_etc.patch needs update
 
 Summary:	IceWM X11 Window Manager
 Summary(es.UTF-8):	Administrador de Ventanas X11
@@ -19,17 +19,17 @@
 Summary(uk.UTF-8):	Віконний менеджер для X11
 Summary(de.UTF-8):	IceWM ist ein Window Manager für X
 Name:		icewm
-Version:	1.2.25
+Version:	1.2.30
 #%define _pre pre1
 %define	_iceicons_ver		0.6
 %define	_netscapeicons_ver	0.2
-Release:	0.2
+Release:	1
 Epoch:		2
 License:	LGPL
 Group:		X11/Window Managers
 #Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}%{_pre}.tar.gz
 Source0:	http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz
-# Source0-md5:	af69d095a6c6fba1f73f80e966bc4459
+# Source0-md5:	8a302c5e629bb81d87cc02004a694ece
 Source1:	IceWM.desktop
 Source3:	http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz
 # Source3-md5:	53ed111a3c4d1e609bd1604ddccd4701
@@ -38,22 +38,23 @@
 # Source6-md5:	409aa9b02adc11309ed546c5120c01d2
 Source7:	%{name}-xsession.desktop
 Patch0:		%{name}-broken-xrandr.patch
-Patch1:		%{name}-home_etc.patch
+#Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-helpbrowser.patch
-Patch3:		%{name}-types.patch
 URL:		http://www.icewm.org/
-BuildRequires:	XFree86-devel
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_guievents:BuildRequires:	esound-devel}
 BuildRequires:	gettext-devel
 %{?with_imlib:BuildRequires:	imlib-devel}
 BuildRequires:	libstdc++-devel
-%{?with_freetype:BuildRequires:	xft-devel >= 2.1}
+#%:wq
+%{?with_freetype:BuildRequires:	xorg-lib-libXft-devel >= 2.1}
 %{?with_guievents:BuildRequires:	yiff-devel}
 Requires(pre):	fileutils
 Requires(pre):	sh-utils
 Requires:	vfmg >= 0.9.95
+Requires:	xinitrc-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_wmstyledir	/etc/sysconfig/wmstyle
@@ -132,9 +133,8 @@
 #setup -q -n %{name}-%{version}%{_pre}
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#patch1 -p1
 #patch2 -p1
-%patch3 -p1
 
 mv -f po/{zh_TW.Big5,zh_TW}.po
 
@@ -179,7 +179,7 @@
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
-echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg -i -f -x -c -s icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
 
 %find_lang %{name}
 
@@ -227,6 +227,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.203  2007/07/12 22:22:38  twittner
+- up to 1.2.30
+- -types.patch in sources - removed
+- home_etc.patch needs its author attention (commented out)
+
 Revision 1.202  2007/06/04 20:00:25  qrczak
 - Fixed bcond comment
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/icewm.spec?r1=1.202&r2=1.203&f=u