- s/X11R6//

[packages/icewm.git] / icewm.spec

diff --git a/icewm.spec b/icewm.spec
index 300610e505a50fd32a8278255809371a55d8c913..caa94fb5d3e0dca0c93e884343c917b951ad4783 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
 # _with_gradients      - enable gradients (implies _with_antialiasing)
-# _with_antialiasing   - enable antialiasing (implies _with_freetype)
-# _without_freetype    - disable xfreetype support
+# _without_antialiasing        - disable antialiasing
+# _without_freetype    - disable xfreetype support (implies _without_antialiasing)
 # _without_guievents   - disable guievents
 # _without_gnome       - disable GNOME support
 # _without_imlib       - disable imlib support
@@ -19,8 +19,8 @@ Summary(pt_BR):       Gerenciador de Janelas X11
 Summary(ru):   ïËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
-Version:       1.2.3
-Release:       1
+Version:       1.2.6
+Release:       3
 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
@@ -30,21 +30,21 @@ Source2:    %{name}.directory
 Source3:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/iceicons-0.6.tar.gz
 Source4:       IceWM.RunWM
 Source5:       IceWM.wm_style
-Source6:       %{name}-menu
-Source7:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/netscapeicons-0.2.tar.gz
-Patch0:                %{name}-menu.patch
-Patch1:                %{name}-compile-fixes.patch
+Source6:       http://cesnet.dl.sourceforge.net/sourceforge/icewm/netscapeicons-0.2.tar.gz
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
+BuildRequires: autoconf
+BuildRequires: automake
 %{!?_without_guievents:BuildRequires:  esound-devel}
+BuildRequires: gettext-devel
 %{!?_without_gnome:BuildRequires:      gnome-libs-devel}
 %{!?_without_imlib:BuildRequires:      imlib-devel}
 BuildRequires: libstdc++-devel
+%{!?_without_freetype:BuildRequires:   Xft-devel >= 2.1}
 Requires(pre): fileutils
 Requires(pre): sh-utils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
 %define                _wmstyledir     /etc/sysconfig/wmstyle
 %define                _wmpropsdir     %{_datadir}/wm-properties
 
@@ -108,25 +108,26 @@ nice2, warp3, warp4, win95.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}
-tar -xzf %{SOURCE7}
+tar -xzf %{SOURCE6}
 cd ../..
 
 %build
 rm -f missing
+#%%{__gettextize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %configure \
        %{?_with_gradients:--enable-gradients} \
-       %{?_with_antialiasing:--enable-antialiasing} \
-       %{!?_without_freetype:--enable-xfreetype} \
+       %{!?_without_antialiasing:--enable-antialiasing} \
+       %{?_without_freetype:--disable-xfreetype} \
        %{!?_without_guievents:--enable-guievents} \
        %{!?_without_gnome:--with-gnome-menus} \
        %{?_without_imlib:--without-imlib} \
+       --enable-shaped-decorations \
        --with-cfgdir=%{_sysconfdir}/X11/%{name} \
        --with-docdir=%{_docdir}
 %{__make}
@@ -142,7 +143,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings/IceWM/.directory
 install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.sh
 install %{SOURCE5} $RPM_BUILD_ROOT%{_wmstyledir}/IceWM.names
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
 install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys
 install lib/preferences $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences
 install lib/toolbar $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/toolbar
@@ -150,6 +150,8 @@ install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/winoptions
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm icewm-menu-gnome1 --list \"%{_applnkdir}\"" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+
 %find_lang %{name}
 
 %clean