- upgraded to 1.2.3,

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 8cad92e7cb7ccd1646a763e0ae5eda4b3daf98eb..53f2d77071f460fede457b37e93b42f639ae9174 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,36 +1,44 @@
 #
 # Conditional build:
-# _with_antialiasing - enable antialiasing
-# _with_gradients - enable gradients (implies _with_antialiasing)
+# _with_gradients      - enable gradients (implies _with_antialiasing)
+# _with_antialiasing   - enable antialiasing (implies _with_freetype)
+# _without_freetype    - disable xfreetype support
+# _without_guievents   - disable guievents
+# _without_gnome       - disable GNOME support
+# _without_imlib       - disable imlib support
 #
 # TODO:
 # - make a PLD-theme - default :]
 # - bigger menu-file
 #
+
 Summary:       IceWM X11 Window Manager
 Summary(es):   Administrador de Ventanas X11
-Summary(pl):   IceWM - mened¿er okienek X11
+Summary(pl):   IceWM - zarz±dca okienek X11
 Summary(pt_BR):        Gerenciador de Janelas X11
 Summary(ru):   ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
-Version:       1.2.0
+Version:       1.2.3
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         X11/Window Managers
-Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/%{name}-%{version}.tar.gz
+Source0:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/%{name}-%{version}.tar.gz
 Source1:       IceWM.desktop
 Source2:       %{name}.directory
-Source3:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/iceicons-0.6.tar.gz
+Source3:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/iceicons-0.6.tar.gz
 Source4:       IceWM.RunWM
 Source5:       IceWM.wm_style
 Source6:       %{name}-menu
-Source7:       ftp://ftp.sourceforge.net/pub/sourceforge/icewm/netscapeicons-0.2.tar.gz
+Source7:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/netscapeicons-0.2.tar.gz
+Patch0:                %{name}-menu.patch
+Patch1:                %{name}-compile-fixes.patch
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: imlib-devel
+%{!?_without_guievents:BuildRequires:  esound-devel}
+%{!?_without_gnome:BuildRequires:      gnome-libs-devel}
+%{!?_without_imlib:BuildRequires:      imlib-devel}
 BuildRequires: libstdc++-devel
 Requires(pre): fileutils
 Requires(pre): sh-utils
@@ -55,9 +63,9 @@ tareas, lista de ventanas, estado de la caja de entrada del correo y
 reloj digital. Rápido y pequeño.
 
 %description -l pl
-Mened¿er okienek pod X11. Mo¿e emulowaæ wygl±d Windows'95, OS/2 Warp
-3,4, MWM. Mened¿er ten próbuje wybraæ najlepsze cechy dostêpne w
-powy¿szych ¶rodowiskach, jak: wiele jednocze¶nie obecnych przestrzeni
+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.
 
@@ -91,15 +99,17 @@ Requires:   icewm
 
 %description themes-base
 Standard pack of themes delivered with IceWM. All of them made by
-Marko Macek: gtk2, metal2, motif, nice, warp3, warp4, win95.
+Marko Macek: gtk2, metal2, motif, nice, nice2, warp3, warp4, win95.
 
 %description themes-base -l pl
 Standardowy zestaw tematów dla IceWM-a, dostarczany wraz z nim.
 Wszystkie stworzone przez Marko Macka: gtk2, metal2, motif, nice,
-warp3, warp4, win95.
+nice2, warp3, warp4, win95.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
@@ -107,15 +117,18 @@ tar -xzf %{SOURCE7}
 cd ../..
 
 %build
+rm -f missing
+%{__aclocal}
+%{__autoconf}
 %configure \
-       --with-docdir=%{_docdir} \
-       --enable-i18n \
-       --enable-guievents \
-       --enable-xfreetype \
-       --with-gnome-menus \
-       --with-imlib \
+       %{?_with_gradients:--enable-gradients} \
        %{?_with_antialiasing:--enable-antialiasing} \
-       %{?_with_gradients:--enable-gradients}
+       %{!?_without_freetype:--enable-xfreetype} \
+       %{!?_without_guievents:--enable-guievents} \
+       %{!?_without_gnome:--with-gnome-menus} \
+       %{?_without_imlib:--without-imlib} \
+       --with-cfgdir=%{_sysconfdir}/X11/{name} \
+       --with-docdir=%{_docdir}
 %{__make}
 
 %install
@@ -135,7 +148,7 @@ install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/preferences
 install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/toolbar
 install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/icewm/winoptions
 
-ln -s %{_libdir}/X11/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
+ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
 %find_lang %{name}
 
@@ -152,13 +165,13 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 %dir %{_sysconfdir}/X11/icewm
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/icewm/*
 %{_pixmapsdir}/icewm
-%dir %{_libdir}/X11/icewm
-%{_libdir}/X11/icewm/icons
-%{_libdir}/X11/icewm/ledclock
-%{_libdir}/X11/icewm/mailbox
-%{_libdir}/X11/icewm/taskbar
-%dir %{_libdir}/X11/icewm/themes
-%{_libdir}/X11/icewm/themes/Infadel2
+%dir %{_datadir}/icewm
+%{_datadir}/icewm/icons
+%{_datadir}/icewm/ledclock
+%{_datadir}/icewm/mailbox
+%{_datadir}/icewm/taskbar
+%dir %{_datadir}/icewm/themes
+%{_datadir}/icewm/themes/Infadel2
 %dir %{_applnkdir}/Settings/IceWM
 %{_applnkdir}/Settings/IceWM/.directory
 %{_wmpropsdir}/*
@@ -167,10 +180,11 @@ test -h %{_pixmapsdir}/icewm || rm -rf %{_pixmapsdir}/icewm
 
 %files themes-base
 %defattr(644,root,root,755)
-%{_libdir}/X11/icewm/themes/gtk2
-%{_libdir}/X11/icewm/themes/metal2
-%{_libdir}/X11/icewm/themes/motif
-%{_libdir}/X11/icewm/themes/nice
-%{_libdir}/X11/icewm/themes/warp3
-%{_libdir}/X11/icewm/themes/warp4
-%{_libdir}/X11/icewm/themes/win95
+%{_datadir}/icewm/themes/gtk2
+%{_datadir}/icewm/themes/metal2
+%{_datadir}/icewm/themes/motif
+%{_datadir}/icewm/themes/nice
+%{_datadir}/icewm/themes/nice2
+%{_datadir}/icewm/themes/warp3
+%{_datadir}/icewm/themes/warp4
+%{_datadir}/icewm/themes/win95