- fixed vfmg patch, updated plmenu patch

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 0b22c253dbaad46a4c5f270a92f2ff11d55141ae..4edd25902ac2fabf69a5007c5d333f5c57c84b99 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}.8
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
@@ -24,7 +24,7 @@ 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,26 +32,24 @@ 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
 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
-Requires:      %{name}-libs = %{version}
+BuildRequires: xft-devel
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
 Requires:      tk
 Requires:      wmconfig >= 0.9.9-5
@@ -154,7 +152,9 @@ 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
+Requires:      xft-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
@@ -216,7 +216,7 @@ utilizando componentes est
 ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.
 
 %prep
-%setup -q -a 1 -a 2
+%setup -q -a 1 -a 2 -n %{name}-CVS-%{_snap}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -226,13 +226,12 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -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
@@ -243,11 +242,18 @@ 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}
-%{__autoconf}
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 cd %{name}-extra-%{extraver}
        %{__libtoolize}
        %{__aclocal}
@@ -378,12 +384,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_bindir}/get-wings-flags
 %attr(755,root,root) %{_bindir}/get-wraster-flags
 %attr(755,root,root) %{_bindir}/get-wutil-flags
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/*
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)