- rel 1

diff --git a/IceWM.desktop b/IceWM.desktop
deleted file mode 100644 (file)
index afbb855..0000000
--- a/IceWM.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Ice WM
-Name[ca]=Gestor Ice
-Name[da]=IceWM
-Name[gl]=IceWM
-Name[ko]=Ice WM
-Name[nb]=Ice vindushåndterer
-Name[pl]=IceWM
-Exec=icewm
-TryExec=icewm
-[Window Manager]
-SessionManaged=true
-# vi: encoding=utf-8

diff --git a/desktop-files.patch b/desktop-files.patch
new file mode 100644 (file)
index 0000000..61e91d8
--- /dev/null
+++ b/desktop-files.patch
@@ -0,0 +1,36 @@
+--- icewm-3.0.1/lib/icewm.desktop~     2022-10-06 06:35:09.000000000 +0000
++++ icewm-3.0.1/lib/icewm.desktop      2022-10-15 09:28:14.629672133 +0000
+@@ -7,6 +7,7 @@
+ GenericName[es]=Administrador de ventanas
+ GenericName[fr]=Gestionnaire de Fenêtres
+ GenericName[id]=Pengelola Jendela
++GenericName[pl]=Manager okien
+ GenericName[pt]=Gestor de Janelas
+ GenericName[pt_BR]=Gerenciador de Janelas
+ GenericName[uk]=Менеджер вікон IceWM
+@@ -14,6 +15,7 @@
+ Comment[da]=Simpel og hurtig vindueshåndtering
+ Comment[es]=Administrador de ventanas simple y rápido
+ Comment[id]=Pengelola jendela sederhana dan cepat
++Comment[pl]=Prosty i szybki manager okien
+ Comment[pt]=Gestor de janelas simples e rápido
+ Comment[pt_BR]=Gerenciador simples e rápido de janelas
+ Comment[uk]=Простий та швидкий менеджер вікон
+--- icewm-3.0.1/lib/icewm-session.desktop~     2022-10-06 06:35:09.000000000 +0000
++++ icewm-3.0.1/lib/icewm-session.desktop      2022-10-15 09:29:18.391272949 +0000
+@@ -6,6 +6,7 @@
+ Name[de]=IceWM-Sitzung
+ Name[es]=Sesión de IceWM
+ Name[id]=Sesi IceWM
++Name[pl]=Sesja IceWM
+ Name[pt]=Sessão IceWM
+ Name[pt_BR]=Sessão do IceWM
+ Name[ru]=Сеанс IceWM
+@@ -16,6 +17,7 @@
+ GenericName[es]=Administrador de ventanas
+ GenericName[fr]=Gestionnaire de Fenêtres
+ GenericName[id]=Pengelola Jendela
++GenericName[pl]=Manager okien
+ GenericName[pt]=Gestor de Janelas
+ GenericName[pt_BR]=Gerenciador de Janelas
+ GenericName[ru]=Менеджер окон IceWM

diff --git a/icewm-build-fixes.patch b/icewm-build-fixes.patch
deleted file mode 100644 (file)
index a9fb5c6..0000000
--- a/icewm-build-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- icewm-1.3.12/configure.ac.orig     2020-11-11 11:21:19.688467839 +0100
-+++ icewm-1.3.12/configure.ac  2020-11-11 11:23:25.721118395 +0100
-@@ -347,7 +347,7 @@
- AC_ARG_ENABLE([menus-gnome2],
-     AC_HELP_STRING([--disable-menus-gnome2],[Disable display of GNOME 2 menus.]))
- if test x$enable_menus_gnome2 != xno; then
--    PKG_CHECK_MODULES([GNOME2],[gnome-desktop-2.0 libgnomeui-2.0],[
-+    PKG_CHECK_MODULES([GNOME2],[gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0],[
-       GNOME_VER=2
-       AC_DEFINE([CONFIG_GNOME_MENUS],[1],[Define to make IceWM more GNOME-friendly])
-       BUILD_MENU_GNOME2=yes
-Index: icewm-1.3.7/src/yapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/yapp.cc       2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yapp.cc    2011-03-14 15:58:59.000000000 +0100
-@@ -269,7 +269,7 @@
-         }
- #endif
- 
--        {
-+        if(measure_latency) {
-             struct timeval difftime;
-             struct timeval curtime;
-             gettimeofday(&curtime, 0);

diff --git a/icewm-startup.sh b/icewm-startup.sh
index fc01ae7b60d0c024d58687b8ab7298f67efbfa7e..7b9093eccc8e5436b5b06ec2a528941c89c1252e 100644 (file)
--- a/icewm-startup.sh
+++ b/icewm-startup.sh
@@ -2,5 +2,6 @@
 
 if [ ! -d ~/.icewm ] ; then
        mkdir -p ~/.icewm
-       install -m 644 /etc/X11/icewm/* ~/.icewm/
+       install -m 644 /etc/X11/icewm/{keys,menu,preferences,programs,restart,toolbar,winoptions} ~/.icewm/
+       echo `which icewmbg` > ~/.icewm/startup
 fi

diff --git a/icewm.spec b/icewm.spec
index 162b55dca0102b9a6d581be5f683af7badc661cc..aebd0caff1134d8d5a6b7cf1d129d9267d6d12fb 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -6,10 +6,6 @@
 %bcond_without alsa            # ALSA sound for GUI events
 %bcond_without ao              # AO sound for GUI events
 
-%if %{without guievents}
-%undefine      with_alsa
-%undefine      with_ao
-%endif
 Summary:       IceWM X11 Window Manager
 Summary(de.UTF-8):     IceWM ist ein Window Manager für X
 Summary(es.UTF-8):     Administrador de Ventanas X11
@@ -17,59 +13,54 @@ Summary(pl.UTF-8):  IceWM - zarządca okienek X11
 Summary(pt_BR.UTF-8):  Gerenciador de Janelas X11
 Summary(ru.UTF-8):     Оконный менеджер для X11
 Summary(uk.UTF-8):     Віконний менеджер для X11
-%define        iceicons_ver            0.6
 Name:          icewm
 Version:       3.0.1
-Release:       0.2
+Release:       1
 Epoch:         2
 License:       LGPL v2
 Group:         X11/Window Managers
 #Source0Download: https://github.com/ice-wm/icewm/releases
 Source0:       https://github.com/ice-wm/icewm/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: e4676ea3fbed01b9b8dc1fd98d174119
-Source1:       IceWM.desktop
-Source3:       http://downloads.sourceforge.net/icewm/iceicons-%{iceicons_ver}.tar.gz
-# Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701
-Source4:       %{name}-startup.sh
-Patch0:                %{name}-build-fixes.patch
+Source1:       %{name}-startup.sh
+Patch0:                desktop-files.patch
 URL:           https://ice-wm.org/
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
-%{?with_ao:BuildRequires:      libao-devel}
-BuildRequires: ruby-asciidoctor
-BuildRequires: binutils
-BuildRequires: git-core
 BuildRequires: cmake
 BuildRequires: discount
 BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
 BuildRequires: fribidi-devel >= 0.10.4
 BuildRequires: gettext >= 0.19.6
 BuildRequires: gettext-tools >= 0.19.6
+BuildRequires: git-core
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: imlib2-devel
+%{?with_ao:BuildRequires:      libao-devel}
+BuildRequires: librsvg-devel
 %{?with_alsa:BuildRequires:    libsndfile-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.4.2
 BuildRequires: pkgconfig
+BuildRequires: ruby-asciidoctor
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
-BuildRequires: freetype-devel
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXcomposite-devel
+BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
 %{?with_freetype:BuildRequires:        xorg-lib-libXft-devel >= 2.1}
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXpm-devel
 BuildRequires: xorg-lib-libXrandr-devel
-BuildRequires: xorg-lib-libXcomposite-devel
-BuildRequires: xorg-lib-libXdamage-devel
-BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xorg-lib-libXrender-devel
-BuildRequires: librsvg-devel
 Requires(pre): /bin/rm
 Requires(pre): /usr/bin/test
 Requires:      shared-mime-info
 Requires:      xinitrc-ng
-Suggests:      vfmg >= 0.9.95
+Requires:      xorg-app-xrandr
 Conflicts:     filesystem < 3.0-20
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -160,6 +151,7 @@ IceWM-em 1.4:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake -B build \
@@ -168,7 +160,7 @@ IceWM-em 1.4:
        -DDOCDIR=%{_docdir}/%{name}-%{version} \
        %{?with_alsa:-DENABLE_ALSA=ON} \
        %{?with_ao:-DENABLE_AO=ON} \
-       %{!?with_freetype:-DCONFIG_XFREETYPE=OFF -DCONFIG_COREFONTS=ON} 
+       %{!?with_freetype:-DCONFIG_XFREETYPE=OFF -DCONFIG_COREFONTS=ON}
 
 cd build
 %{__make}
@@ -181,22 +173,26 @@ cd build
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 cd ..
-#%{__sed} -e 's|^# IconPath=""|IconPath="%{_pixmapsdir}:%{_datadir}/icons"|' -i $RPM_BUILD_ROOT%{_datadir}/icewm/preferences
+
+cd build/man
+%{__ln} -s icewm.1.html icewm.html
+cd -
+
+%{__sed} -e 's|^# IconPath=.*|IconPath="%{_pixmapsdir}:%{_iconsdir}:"|' -i $RPM_BUILD_ROOT%{_datadir}/icewm/preferences
 
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
-cp -p build/lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
-cp -p build/lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
-cp -p build/lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/winoptions
-echo %{_bindir}/icewmbg > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/menu $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/programs $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/programs
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/startup $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/startup
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
+cp -p $RPM_BUILD_ROOT%{_datadir}/icewm/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/winoptions
 :> $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/restart
 
-#ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
-
-#echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm vfmg -i -f -x -c -s icewm" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
-
 # old themes, no longer installed
 cp -pr lib/themes/{gtk2,nice,nice2,warp3,warp4,yellowmotif} $RPM_BUILD_ROOT%{_datadir}/icewm/themes
 
@@ -210,9 +206,6 @@ cp -pr lib/themes/{gtk2,nice,nice2,warp3,warp4,yellowmotif} $RPM_BUILD_ROOT%{_da
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS CHANGES ChangeLog NEWS PLATFORMS README.md THANKS TODO build/man/*.html
@@ -249,12 +242,13 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %{_mandir}/man5/icewm-winoptions.5*
 %dir %{_sysconfdir}/X11/%{name}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/keys
-#%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/menu
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/menu
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/preferences
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/programs
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/toolbar
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/winoptions
 %config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/restart
 %config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/startup
-#%{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/IceWM.jpg
 %{_datadir}/icewm/icons