- rel 10 for rebuild

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 7129455fa5f50bc04c0f2072888d017cd4595a53..21c87b19a2a50f3446ee1b5187df7c64321e3a67 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}.3
+Release:       0.%{_snap}.10
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
@@ -20,11 +20,9 @@ Source1:     ftp://windowmaker.org/pub/%{name}-data.tar.gz
 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}-wmconfig.patch
+Patch1:                %{name}-vfmg.patch
 Patch2:                %{name}-pixmaps.patch
 Patch3:                %{name}-shared.patch
 Patch4:                %{name}-areas.patch
@@ -32,29 +30,27 @@ 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
 URL:           http://www.windowmaker.org/
-BuildRequires: Hermes-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libungif-devel
+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
@@ -155,6 +151,7 @@ Summary(uk):        
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      XFree86-devel
+Requires:      xft-devel
 Obsoletes:     libwraster2-devel
 
 %description devel
@@ -226,7 +223,6 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -234,14 +230,20 @@ utilizando componentes est
 %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
 mv -f po/{zh_TW.Big5,zh_TW}.po
 mv -f WPrefs.app/po/{zh_TW.Big5,zh_TW}.po
 
+# don't use x86 asm, it's broken
+# (wrlib/x86_specific.c contains far too many assumptions about function
+#  frame used by gcc, so it can crash depending on gcc version and
+#  optimizations - and did so in Ac i686 packages)
+%{__perl} -pi -e 's/test \$x86 = 1/false/' configure.ac
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -301,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}
@@ -325,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/*