pl

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index f9543acb71ad15ea270df8af395899bfe8e1d203..508296039d36d9c02fc619b9db8cd4e8155bae2d 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,5 +1,7 @@
 %define                extraver        0.1
-%define                _snap           20040321
+%define                _snap           20040718
+
+%bcond_without xft     # disable xft support, doesn't work, bug in sources
 
 Summary:       NeXT-alike window manager
 Summary(es):   Administrador de Ventanas parecido con el NeXT
@@ -10,11 +12,11 @@ Summary(ru):        WindowMaker - 
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
 Version:       0.81.0
-Release:       0.%{_snap}.11
+Release:       0.%{_snap}.1
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
-# Source0-md5: ecbd8f1cee5e2ad1adb99baadb142169
+# Source0-md5: dba7dc37031ecce4c6b71c627c784ece
 Source1:       ftp://windowmaker.org/pub/%{name}-data.tar.gz
 # Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82
 Source2:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz
@@ -34,7 +36,7 @@ Patch11:      %{name}-pl.po-update.patch
 Patch12:       %{name}-wmchlocale-fixes.patch
 Patch13:       http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
 Patch14:       %{name}-localenames.patch
-Patch15:       %{name}-CVS-before-xft2.patch
+Patch15:       %{name}-enablexft.patch
 URL:           http://www.windowmaker.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -213,7 +215,7 @@ utilizando componentes est
 ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.
 
 %prep
-%setup -q -a 1 -a 2 -n %{name}-CVS-%{_snap}
+%setup -q -a 1 -a 2 -n %{name}-CVS-20040723
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -227,7 +229,7 @@ utilizando componentes est
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p0
+#%patch15 -p0
 
 for f in WindowMaker/*menu*; do
        sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
@@ -273,7 +275,8 @@ perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#e
        --enable-kde \
        --enable-shared \
        --enable-static \
-       --enable-usermenu
+       --enable-usermenu \
+%{!?with_xft:--disable-xft}
 
 touch WindowMaker/Defaults/W*.in