- replace wmstyle startup script with script run directly by icewm-session

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index d3bc86a37aa7bc66267091896f76104f9c033f61..dd4f889eb15a1e71f02887f90ecab6772324806a 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,61 +1,67 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without gradients       # enable gradients (implies with_antialiasing)
-%bcond_without antialiasing    # disable antialiasing
+%bcond_without gradients       # disable gradients (requires antialiasing which requires freetype)

 %bcond_without freetype        # disable xfreetype support (implies !with_antialiasing)
 %bcond_without guievents       # disable guievents
 %bcond_without freetype        # disable xfreetype support (implies !with_antialiasing)
 %bcond_without guievents       # disable guievents

-%bcond_without imlib           # disable imlib support

 #
 # TODO:
 # - make a PLD-theme - default :]
 #
 # TODO:
 # - make a PLD-theme - default :]

-#

 
 Summary:       IceWM X11 Window Manager
 
 Summary:       IceWM X11 Window Manager

-Summary(es):   Administrador de Ventanas X11
-Summary(pl):   IceWM - zarz±dca okienek X11
-Summary(pt_BR):        Gerenciador de Janelas X11
-Summary(ru):   ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
-Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
-Summary(de):   Enlightenment ist ein Window Manager für X
+Summary(de.UTF-8):     IceWM ist ein Window Manager für X
+Summary(es.UTF-8):     Administrador de Ventanas X11
+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

 Name:          icewm
 Name:          icewm

-Version:       1.2.20
-#%define _pre pre1
-Release:       0.1
+Version:       1.3.7
+%define        _iceicons_ver           0.6
+%define        _netscapeicons_ver      0.2
+Release:       2

 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
 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:       http://dl.sourceforge.net/icewm/%{name}-%{version}.tar.gz

-# Source0-md5: 6c94dae56fbf9aa085a1d780538018c1
+# Source0-md5: 224695231aedb2b91db3254a13e1c8dd

 Source1:       IceWM.desktop
 Source1:       IceWM.desktop

-Source3:       http://dl.sourceforge.net/icewm/iceicons-0.6.tar.gz
+Source3:       http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz

 # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701
 # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701

-Source4:       IceWM.RunWM
-Source6:       http://dl.sourceforge.net/icewm/netscapeicons-0.2.tar.gz
+Source4:       icewm-startup.sh
+Source6:       http://dl.sourceforge.net/icewm/netscapeicons-%{_netscapeicons_ver}.tar.gz

 # Source6-md5: 409aa9b02adc11309ed546c5120c01d2
 Source7:       %{name}-xsession.desktop
 # Source6-md5: 409aa9b02adc11309ed546c5120c01d2
 Source7:       %{name}-xsession.desktop

-Patch0:                %{name}-broken-xrandr.patch
-Patch1:                %{name}-home_etc.patch
-Patch2:                %{name}-helpbrowser.patch
+Patch0:                %{name}-build-fixes.patch
+Patch1:                %{name}-tray_hotfixes.patch
+Patch2:                %{name}-fix_input_focus_loss_for_deiconified_frame_1.patch
+Patch3:                %{name}-ifstate-exact-check.patch
+Patch4:                %{name}-imap-unseen.patch
+Patch5:                %{name}-autohide.patch

 URL:           http://www.icewm.org/
 URL:           http://www.icewm.org/

-BuildRequires: XFree86-devel

 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake

-%{?with_guievents:BuildRequires:       esound-devel}
+BuildRequires: gdk-pixbuf-devel

 BuildRequires: gettext-devel
 BuildRequires: gettext-devel

-%{?with_imlib:BuildRequires:   imlib-devel}
+BuildRequires: gtk+2-devel
+BuildRequires: kde4-kde3support

 BuildRequires: libstdc++-devel
 BuildRequires: libstdc++-devel

-%{?with_freetype:BuildRequires:        xft-devel >= 2.1}
-BuildRequires: yiff-devel
+BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libX11-devel
+%{?with_freetype:BuildRequires:        xorg-lib-libXft-devel >= 2.1}
+BuildRequires: xorg-lib-libXinerama-devel
+%{?with_guievents:BuildRequires:       yiff-devel}

 Requires(pre): fileutils
 Requires(pre): sh-utils
 Requires(pre): fileutils
 Requires(pre): sh-utils

-Requires:      vfmg
+Requires:      shared-mime-info

 Requires:      xinitrc-ng
 Requires:      xinitrc-ng

+Suggests:      vfmg >= 0.9.95
+Conflicts:     filesystem < 3.0-20

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _wmstyledir     /etc/sysconfig/wmstyles
-%define                _wmpropsdir     /usr/share/wm-properties
-%define                specflags_ia32   -fomit-frame-pointer
+%define                _wmpropsdir     /usr/share/gnome/wm-properties
+%define                specflags_ia32  -fomit-frame-pointer

 
 %description
 Window Manager for X Window System. Can emulate the look of
 
 %description
 Window Manager for X Window System. Can emulate the look of


@@ -63,56 +69,56 @@ Windows'95, OS/2 Warp 3,4, Motif. Tries to take the best features of
 the above systems. Features multiple workspaces, opaque move/resize,
 task bar, window list, mailbox status, digital clock. Fast and small.
 
 the above systems. Features multiple workspaces, opaque move/resize,
 task bar, window list, mailbox status, digital clock. Fast and small.
 

-%description -l es
+%description -l es.UTF-8

 Administrador de Ventanas para el X Window. Puede emular la apariencia
 del Windows'95, OS/2 Warp 3 y 4 y el Motif. Intenta usar las mejores
 Administrador de Ventanas para el X Window. Puede emular la apariencia
 del Windows'95, OS/2 Warp 3 y 4 y el Motif. Intenta usar las mejores

-características de los sistemas citados. Características: varios
+características de los sistemas citados. Características: varios

 ambientes de trabajo, movimiento/ redimensionamiento opaco, barra de
 tareas, lista de ventanas, estado de la caja de entrada del correo y
 ambientes de trabajo, movimiento/ redimensionamiento opaco, barra de
 tareas, lista de ventanas, estado de la caja de entrada del correo y

-reloj digital. Rápido y pequeño.
+reloj digital. Rápido y pequeño.

 
 

-%description -l pl
-Zarz±dca okienek pod X11. Mo¿e emulowaæ wygl±d Windows'95, OS/2 Warp
-3, 4, MWM. Zarz±dca ten próbuje przej±æ z powy¿szych ¶rodowisk ich
-najlepsze cechy, takie jak: wiele jednocze¶nie obecnych przestrzeni
-roboczych, paski narzêdziowe, status skrzynki z poczt±, cyfrowy zegar.
-Jest przy tym ma³y i szybki.
+%description -l pl.UTF-8
+Zarządca okienek pod X11. Może emulować wygląd Windows'95, OS/2 Warp
+3, 4, MWM. Zarządca ten próbuje przejąć z powyższych środowisk ich
+najlepsze cechy, takie jak: wiele jednocześnie obecnych przestrzeni
+roboczych, paski narzędziowe, status skrzynki z pocztą, cyfrowy zegar.
+Jest przy tym mały i szybki.

 
 

-%description -l pt_BR
-Gerenciador de Janelas para o X Window. Pode emular a aparência do
+%description -l pt_BR.UTF-8
+Gerenciador de Janelas para o X Window. Pode emular a aparência do

 Windows'95, OS/2 Warp 3 e 4 e o Motif. Tenta usar as melhores
 Windows'95, OS/2 Warp 3 e 4 e o Motif. Tenta usar as melhores

-características dos sistemas citados. Características: vários
-ambientes de trabalho, movimentação/ redimensionamento opaco, barra de
+características dos sistemas citados. Características: vários
+ambientes de trabalho, movimentação/ redimensionamento opaco, barra de

 tarefas, lista de janelas, status da caixa de entrada do correio e
 tarefas, lista de janelas, status da caixa de entrada do correio e

-relógio digital. É rápido e pequeno.
-
-%description -l ru
-ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X Window System. íÏÖÅÔ ÜÍÕÌÉÒÏ×ÁÔØ ×ÎÅÛÎÉÊ ×ÉÄ
-Windows'95, OS/2 Warp 3,4, Motif. óÔÁÒÁÅÔÓÑ ×ÚÑÔØ ÌÕÞÛÅÅ ÉÚ ÕÐÏÍÑÎÕÔÙÈ
-ÓÉÓÔÅÍ. ðÏÄÄÅÒÖÉ×ÁÅÔ ÎÅÓËÏÌØËÏ ÒÁÂÏÞÉÈ ÐÏ×ÅÒÈÎÏÓÔÅÊ, ÎÅÐÒÏÚÒÁÞÎÏÅ
-ÐÅÒÅÍÅÝÅÎÉÅ ÏËÏÎ, ÐÏÌÏÓËÕ ÚÁÄÁÎÉÊ, ÓÐÉÓÏË ÏËÏÎ, ÓÔÁÔÕÓ ÐÏÞÔÏ×ÏÇÏ
-ÑÝÉËÁ, ÃÉÆÒÏ×ÙÅ ÞÁÓÙ. âÙÓÔÒÙÊ É ËÏÍÐÁËÔÎÙÊ.
-
-%description -l uk
-÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X Window System. íÏÖÅ ÅÍÕÌÀ×ÁÔÉ ÚÏ×ΦÛÎ¦Ê ×ÉÇÌÑÄ
-Windows'95, OS/2 Warp 3,4, Motif. îÁÍÁÇÁ¤ÔØÓÑ ×ÚÑÔÉ ÎÁÊËÒÁÝÅ ¦Ú
-ÚÇÁÄÁÎÉÈ ÓÉÓÔÅÍ. ð¦ÄÔÒÉÍÕ¤ ˦ÌØËÁ ÒÏÂÏÞÉÈ ÐÌÏÝÉÎ, ÎÅÐÒÏÚÏÒÅ
-ÐÅÒÅͦÝÅÎÎÑ ×¦ËÏÎ, ÓÍÕÖËÕ ÚÁ×ÄÁÎØ, ÓÐÉÓÏË ×¦ËÏÎ, ÓÔÁÎ ÐÏÛÔÏ×ϧ
-ÓËÒÉÎØËÉ, ÃÉÆÒÏ×ÉÊ ÇÏÄÉÎÎÉË. û×ÉÄËÉÊ ÔÁ ËÏÍÐÁËÔÎÉÊ.
-
-%description -l de
+relógio digital. É rápido e pequeno.
+
+%description -l ru.UTF-8
+Оконный менеджер для X Window System. Может эмулировать внешний вид
+Windows'95, OS/2 Warp 3,4, Motif. Старается взять лучшее из упомянутых
+систем. Поддерживает несколько рабочих поверхностей, непрозрачное
+пеÑ\80емеÑ\89ение окон, полоÑ\81кÑ\83 заданий, Ñ\81пиÑ\81ок окон, Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81 поÑ\87Ñ\82ового
+Ñ\8fÑ\89ика, Ñ\86иÑ\84Ñ\80овÑ\8bе Ñ\87аÑ\81Ñ\8b. Ð\91Ñ\8bÑ\81Ñ\82Ñ\80Ñ\8bй и компакÑ\82нÑ\8bй.
+
+%description -l uk.UTF-8
+Віконний менеджер для X Window System. Може емулювати зовнішній вигляд
+Windows'95, OS/2 Warp 3,4, Motif. Намагається взяти найкраще із
+згаданих систем. Підтримує кілька робочих площин, непрозоре
+пеÑ\80емÑ\96Ñ\89еннÑ\8f вÑ\96кон, Ñ\81мÑ\83жкÑ\83 завданÑ\8c, Ñ\81пиÑ\81ок вÑ\96кон, Ñ\81Ñ\82ан поÑ\88Ñ\82овоÑ\97
+скриньки, цифровий годинник. Швидкий та компактний.
+
+%description -l de.UTF-8

 IceWM ist ein in C++ programmierter, unter GPL stehender
 IceWM ist ein in C++ programmierter, unter GPL stehender

-Fenstermanager für das X11-Fenstersystem. Ziel von IceWM ist
+Fenstermanager für das X11-Fenstersystem. Ziel von IceWM ist

 Geschwindigkeit, Schlichtheit und Bedienerfreundlichkeit.
 
 In der Standardeinstellung erinnert das Design von IceWM stark an
 Geschwindigkeit, Schlichtheit und Bedienerfreundlichkeit.
 
 In der Standardeinstellung erinnert das Design von IceWM stark an

-Microsoft Windows: Er verfügt über eine Taskleiste am unteren
-Bildrand, das aktive Fenster lässt sich mit der Tastenkombination
+Microsoft Windows: Er verfügt über eine Taskleiste am unteren
+Bildrand, das aktive Fenster lässt sich mit der Tastenkombination

 ALT-TAB wechseln, etc.
 
 %package themes-base
 Summary:       Pack of themes for IceWM
 ALT-TAB wechseln, etc.
 
 %package themes-base
 Summary:       Pack of themes for IceWM

-Summary(pl):   Zestaw motywów dla IceWM-a
+Summary(pl.UTF-8):     Zestaw motywów dla IceWM-a

 Group:         Themes
 Requires:      icewm
 
 Group:         Themes
 Requires:      icewm
 


@@ -120,20 +126,19 @@ Requires: icewm
 Standard pack of themes delivered with IceWM. All of them made by
 Marko Macek: gtk2, metal2, motif, nice, nice2, warp3, warp4, win95.
 
 Standard pack of themes delivered with IceWM. All of them made by
 Marko Macek: gtk2, metal2, motif, nice, nice2, warp3, warp4, win95.
 

-%description themes-base -l pl
-Standardowy zestaw motywów dla IceWM-a, dostarczany wraz z nim.
+%description themes-base -l pl.UTF-8
+Standardowy zestaw motywów dla IceWM-a, dostarczany wraz z nim.

 Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep
 Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
 nice2, warp3, warp4, win95.
 
 %prep

-#setup -q -n %{name}-%{version}%{_pre}

 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

-#patch2 -p1
-
-mv -f po/{no,nb}.po
-mv -f po/{zh_TW.Big5,zh_TW}.po
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1

 
 cd lib/icons
 tar -xzf %{SOURCE3}
 
 cd lib/icons
 tar -xzf %{SOURCE3}


@@ -145,12 +150,9 @@ cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %{__autoheader}
 %configure \
 %{__autoconf}
 %{__autoheader}
 %configure \

-       %{?with_gradients:--enable-gradients} \
-       %{?with_antialiasing:--enable-antialiasing} \
+       %{!?with_gradients:--disable-gradients} \

        %{!?with_freetype:--disable-xfreetype --enable-corefonts} \
        %{?with_guievents:--enable-guievents} \
        %{!?with_freetype:--disable-xfreetype --enable-corefonts} \
        %{?with_guievents:--enable-guievents} \

-       %{!?with_imlib:--without-imlib} \
-       --disable-menus-gnome \

        --enable-shaped-decorations \
        --with-cfgdir=%{_sysconfdir}/X11/%{name} \
        --with-docdir=%{_docdir}
        --enable-shaped-decorations \
        --with-cfgdir=%{_sysconfdir}/X11/%{name} \
        --with-docdir=%{_docdir}


@@ -158,14 +160,14 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir}} \

        $RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
        $RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}

-install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}-session.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup

 install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 sed 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' < lib/preferences > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
 install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 sed 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' < lib/preferences > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences


@@ -192,19 +194,19 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/X11/%{name}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/[!rs]*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/X11/%{name}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/[!rs]*

-%config(noreplace,missingok) %verify(not %attr(755,root,root md5 mtime) size) %{_sysconfdir}/X11/%{name}/[rs]*
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/X11/%{name}/[rs]*

 %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/icons
 %{_datadir}/icewm/ledclock
 %{_datadir}/icewm/mailbox
 %{_pixmapsdir}/icewm
 %dir %{_datadir}/icewm
 %{_datadir}/icewm/icons
 %{_datadir}/icewm/ledclock
 %{_datadir}/icewm/mailbox

+%attr(755,root,root) %{_datadir}/icewm/startup

 %{_datadir}/icewm/taskbar
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
 %{_datadir}/icewm/taskbar
 %dir %{_datadir}/icewm/themes
 %{_datadir}/icewm/themes/Infadel2
 %{_datadir}/icewm/themes/icedesert
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*

-%attr(755,root,root) %{_wmstyledir}/%{name}-session.sh

 
 %files themes-base
 %defattr(644,root,root,755)
 
 %files themes-base
 %defattr(644,root,root,755)