- update to 20060123 snap (includes fixes for gcc4 and x86_64)

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 445a44194ab2694f1af26c8afd03a148d929910f..dd7fd53c21af6f8c6d067647e7863e2aa2225839 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -8,12 +8,12 @@ Summary(pt_BR):       Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.91.0
-Release:       7
+Version:       0.92.0
+Release:       0.2
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
-# Source0-md5: be07953e905d1e42fe7a65ac2193a5f9
+# Source0-md5: 678cb4a9b22a557cfb524dc3cb457c08
 Source1:       %{name}-data.tar.gz
 # Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82
 Source2:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz
@@ -31,18 +31,19 @@ Patch7:             %{name}-dockit.patch
 Patch8:                %{name}-pl.po-update.patch
 Patch9:                http://www.heily.com/mark/code_samples/appicon_captions_maxprotect.diff
 Patch10:       %{name}-localenames.patch
-Patch11:       %{name}-updateIconImage.patch
-Patch12:       %{name}-0.91.0-translucency-1.patch
+Patch11:       %{name}-0.91.0-translucency-1.patch
+Patch12:       %{name}-gnustep.patch
 URL:           http://www.windowmaker.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libungif-devel
+BuildRequires: perl-base
 BuildRequires: xft-devel
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
@@ -225,7 +226,7 @@ utilizando componentes est
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
+%patch12 -p0
 
 for f in WindowMaker/*menu*; do
        sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
@@ -241,6 +242,9 @@ mv -f po/{no,nb}.po
 %{__perl} -pi -e 's/test \$x86 = 1/false/' configure.ac
 
 %build
+%ifarch %{x8664}
+export ac_cv_c_inline_asm=no
+%endif
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -253,7 +257,7 @@ cd %{name}-extra-%{extraver}
        %{__automake}
 cd ..
 
-perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
+%{__perl} -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
        WindowMaker/Defaults/WMWindowAttributes.in
 
 %configure \
@@ -266,7 +270,12 @@ perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#e
        --enable-static \
        --enable-usermenu \
        --with-appspath=%{_libdir}/GNUstep/Apps \
-       --with-nlsdir=%{_datadir}/locale
+       --with-nlsdir=%{_datadir}/locale \
+       --with-gnustepdir=%{_libdir}/GNUstep \
+       --enable-sound \
+       --enable-gnome \
+       --enable-kde
+
 
 touch WindowMaker/Defaults/W*.in
 
@@ -317,7 +326,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
 
 %dir %{_sysconfdir}/WindowMaker
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/*
 
 %{_mandir}/man1/*
 %lang(sk) %{_mandir}/sk/man1/*
@@ -348,15 +357,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/WindowMaker.desktop
 
 # the first one is shared with gnustep-make...
-%dir %{_libdir}/GNUstep/Apps
-%dir %{_libdir}/GNUstep/Apps/WPrefs.app
+%dir %{_libdir}/GNUstep/Applications
+%dir %{_libdir}/GNUstep/Applications/WPrefs.app
 
-%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs
 
-%{_libdir}/GNUstep/Apps/WPrefs.app/tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/xpm
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
-%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/xpm
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.tiff
+%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.xpm
 
 %files libs
 %defattr(644,root,root,755)