- removed obsoleted patch

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index f4dea501034d63ce60c99dab8e9700ab043e04e8..fe7ab21a0d8ffbc1c574a06a3935f77921c80cc6 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,4 +1,5 @@
 %define                extraver        0.1
+%define                _snap           20040321
 
 Summary:       NeXT-alike window manager
 Summary(es):   Administrador de Ventanas parecido con el NeXT
@@ -8,12 +9,12 @@ Summary(pt_BR):       Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.80.2
-Release:       4
+Version:       0.81.0
+Release:       0.%{_snap}.1
 License:       GPL
 Group:         X11/Window Managers
-Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f4fabc8831af6c58edf8708ee90126f
+Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
+# Source0-md5: ecbd8f1cee5e2ad1adb99baadb142169
 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
@@ -31,11 +32,12 @@ Patch5:             %{name}-IconPosition.patch
 Patch6:                %{name}-singleclick.patch
 Patch7:                %{name}-plmenu.patch
 Patch8:                %{name}-dockit.patch
-Patch9:                %{name}-po.patch
 Patch10:       %{name}-rxvt.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
@@ -46,6 +48,7 @@ BuildRequires:        gettext-devel
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
+BuildRequires: libtool
 BuildRequires: libungif-devel
 Requires:      %{name}-libs = %{version}
 Requires:      cpp
@@ -212,7 +215,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
@@ -222,19 +225,23 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p0
 
 for f in WindowMaker/*menu*; do
-       sed s,/usr/local/GNUstep/,/usr/X11R6/lib/GNUstep/, $f >$f.new
+       sed s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f >$f.new
        mv -f $f.new $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
+
 %build
-rm -f {,%{name}-extra-%{extraver}/}missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -249,10 +256,10 @@ cd ..
 perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
        WindowMaker/Defaults/WMWindowAttributes.in
 
-LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru \
-        sk sv tr zh_CN zh_TW.Big5" ; export LINGUAS
-CPP_PATH="/lib/cpp" ; export CPP_PATH
 %configure \
+       CPP_PATH="/lib/cpp" \
+       LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nb nl pl pt ro ru \
+                sk sv tr zh_CN zh_TW" \
        --disable-rpath \
        --with-nlsdir=%{_datadir}/locale \
        --with-appspath=%{_libdir}/GNUstep/Apps \
@@ -267,8 +274,6 @@ CPP_PATH="/lib/cpp" ; export CPP_PATH
 touch WindowMaker/Defaults/W*.in
 
 %{__make} \
-       LINGUAS="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru \
-               sk sv tr zh_CN zh_TW.Big5" \
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}"
 
@@ -280,12 +285,10 @@ cd %{name}-extra-%{extraver}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/,xsessions,%{_pixmapsdir},%{_wmpropsdir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmpropsdir}} \
        $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
 
 %{__make} install \
-       LINGUAS="cs de el es fi fr gl hr it ja ko nl no pl pt ro ru  \
-               se sk tr zh_CN zh_TW.Big5" \
        DESTDIR=$RPM_BUILD_ROOT
 
 install util/bughint $RPM_BUILD_ROOT%{_bindir}
@@ -354,6 +357,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/WindowMaker
 %{_datadir}/xsessions/WindowMaker.desktop
 
+# the first one is shared with gnustep-make...
 %dir %{_libdir}/GNUstep
 %dir %{_libdir}/GNUstep/Apps
 %dir %{_libdir}/GNUstep/Apps/WPrefs.app