- allow launching of more than one xterm from dock

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 55e509619a14f013476531e1b8054d0bb3a52a16..9edde4a911c150821652977a92b8a8e2f8d00f81 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -10,7 +10,7 @@ Summary(ru):  WindowMaker - 
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
 Version:       0.81.0
-Release:       0.%{_snap}.1
+Release:       0.%{_snap}.2
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
@@ -32,8 +32,7 @@ Patch5:               %{name}-IconPosition.patch
 Patch6:                %{name}-singleclick.patch
 Patch7:                %{name}-plmenu.patch
 Patch8:                %{name}-dockit.patch
-Patch9:                %{name}-po.patch
-Patch10:       %{name}-rxvt.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
@@ -51,7 +50,7 @@ BuildRequires:        libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: libungif-devel
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
 Requires:      tk
 Requires:      wmconfig >= 0.9.9-5
@@ -154,7 +153,8 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ É .h ÆÁÊÌÙ ÄÌÑ WindowMaker
 Summary(uk):   â¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      XFree86-devel
 Obsoletes:     libwraster2-devel
 
 %description devel
@@ -193,7 +193,7 @@ Summary(ru):        
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÄÌÑ WindowMaker
 Group:         Development/Libraries
 Summary(pt_BR):        Componentes estáticos de desenvolvimento para o WindowMaker
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static libraries for building
@@ -226,13 +226,12 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
+%patch15 -p0
 
 for f in WindowMaker/*menu*; do
        sed s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f >$f.new
@@ -246,8 +245,9 @@ mv -f WPrefs.app/po/{zh_TW.Big5,zh_TW}.po
 %build
 %{__libtoolize}
 %{__aclocal}
-%{__autoconf}
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 cd %{name}-extra-%{extraver}
        %{__libtoolize}
        %{__aclocal}