- commented out enablexft patch, it doesn't make any sense, sinse xft

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index aa28fd0b654d81c6a132ed9e5f9eadbc59d532a7..567e6e21093198060188e5277857c9f9073e4295 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,5 +1,5 @@
 %define                extraver        0.1
-%define                _snap           20040321
+%define                _snap           20040718
 
 Summary:       NeXT-alike window manager
 Summary(es):   Administrador de Ventanas parecido con el NeXT
@@ -10,18 +10,16 @@ Summary(ru):        WindowMaker - 
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
 Version:       0.81.0
-Release:       0.%{_snap}.6
+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
 # Source2-md5: 07c7700daaaf232bc490f5abaabef085
 Source3:       %{name}.desktop
-Source4:       %{name}.RunWM
-Source5:       %{name}.wm_style
 Source6:       %{name}-xsession.desktop
 Patch0:                %{name}-CFLAGS.patch
 Patch1:                %{name}-vfmg.patch
@@ -32,12 +30,11 @@ Patch5:             %{name}-IconPosition.patch
 Patch6:                %{name}-singleclick.patch
 Patch7:                %{name}-plmenu.patch
 Patch8:                %{name}-dockit.patch
-Patch10:       %{name}-xterm-dock.patch
 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
@@ -52,8 +49,8 @@ BuildRequires:        xft-devel
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
 Requires:      tk
-Requires:      wmconfig >= 0.9.9-5
-Requires:      xinitrc >= 3.0
+Requires:      vfmg
+Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/X11
@@ -216,7 +213,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
@@ -224,18 +221,17 @@ utilizando componentes est
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
+%patch7 -p1
 %patch8 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p0
+#%patch15 -p0
 
 for f in WindowMaker/*menu*; do
-       sed s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f >$f.new
-       mv -f $f.new $f
+       sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
+       sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
 mv -f po/{no,nb}.po
@@ -307,8 +303,6 @@ install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
 
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.sh
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.names
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
 cd %{name}-extra-%{extraver}
@@ -331,8 +325,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
 
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
-/etc/sysconfig/wmstyle/*.names
 
 %{_mandir}/man1/*
 %lang(sk) %{_mandir}/sk/man1/*