- up to 1.2.30

- -types.patch in sources - removed
- home_etc.patch needs its author attention (commented out)

Changed files:
    icewm-types.patch -> 1.2
    icewm.spec -> 1.203

diff --git a/icewm-types.patch b/icewm-types.patch
deleted file mode 100644 (file)
index 55a88ec..0000000
--- a/icewm-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icewm-1.2.25.orig/src/ylocale.cc   2006-02-03 07:24:27.000000000 +0100
-+++ icewm-1.2.25/src/ylocale.cc        2006-07-25 16:27:42.000000000 +0200
-@@ -152,7 +152,7 @@
-     char * inbuf((char *) lStr), * outbuf((char *) uStr);
-     size_t inlen(lLen), outlen(4 * lLen);
- 
--    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
-+    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
-         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
- 
-     *((YUChar *) outbuf) = 0;

diff --git a/icewm.spec b/icewm.spec
index 9cc3653163eb6cfad29a42810fce063335739b0b..021aa60223f0b867631ee3c8a12746ee93225774 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -8,7 +8,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
@@ -18,17 +18,17 @@ Summary(ru.UTF-8):  Оконный менеджер для X11
 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
@@ -37,22 +37,23 @@ Source6:    http://dl.sourceforge.net/icewm/netscapeicons-%{_netscapeicons_ver}.tar
 # 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
@@ -131,9 +132,8 @@ nice2, warp3, warp4, win95.
 #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
 
@@ -178,7 +178,7 @@ echo %{_bindir}/icewmbg > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
 
 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}