- ups

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 05bd440ec745080153660fb1723d367a23018c10..02816d43d728c936c2c64691723fcf3c2ac9a1e0 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -8,13 +8,13 @@ Summary(pt_BR):       Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.90.0
-Release:       0.1
+Version:       0.91.0
+Release:       5
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
-# Source0-md5: 38b7b146fb866269f3541b87c170f529
-Source1:       ftp://windowmaker.org/pub/%{name}-data.tar.gz
+# Source0-md5: be07953e905d1e42fe7a65ac2193a5f9
+Source1:       %{name}-data.tar.gz
 # Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82
 Source2:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz
 # Source2-md5: 07c7700daaaf232bc490f5abaabef085
@@ -24,22 +24,19 @@ Patch0:             %{name}-CFLAGS.patch
 Patch1:                %{name}-vfmg.patch
 Patch2:                %{name}-pixmaps.patch
 Patch3:                %{name}-shared.patch
-Patch4:                %{name}-areas.patch
-Patch5:                %{name}-IconPosition.patch
-Patch6:                %{name}-singleclick.patch
-Patch7:                %{name}-plmenu.patch
-Patch8:                %{name}-dockit.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}-enablexft.patch
+Patch4:                %{name}-IconPosition.patch
+Patch5:                %{name}-singleclick.patch
+Patch6:                %{name}-plmenu.patch
+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
 URL:           http://www.windowmaker.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: libpng >= 1.0.8
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
@@ -47,6 +44,7 @@ BuildRequires:        libungif-devel
 BuildRequires: xft-devel
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cpp
+Requires:      gnustep-dirs
 Requires:      tk
 Requires:      vfmg
 Requires:      xinitrc-ng
@@ -141,7 +139,7 @@ zarz
 
 %package devel
 Summary:       WindowMaker libraries - development part
-Summary(es):   Bibliotecas, archivos de inclusión, e etc. para desarrollar aplicaciones WindowMaker
+Summary(es):   Bibliotecas y archivos de inclusión para WindowMaker
 Summary(fr):   Librairies de WindowMaker
 Summary(pl):   Biblioteki WindowMakera - czê¶æ dla programistów
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para o WindowMaker
@@ -222,11 +220,8 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-#%patch15 -p0
+%patch9 -p1
+%patch10 -p1
 
 for f in WindowMaker/*menu*; do
        sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
@@ -234,8 +229,6 @@ for f in WindowMaker/*menu*; do
 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
@@ -263,16 +256,13 @@ perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#e
        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 \
-       --enable-sound \
-       --enable-gnome \
        --disable-debug \
-       --enable-kde \
+       --disable-rpath \
        --enable-shared \
        --enable-static \
        --enable-usermenu \
+       --with-appspath=%{_libdir}/GNUstep/Apps \
+       --with-nlsdir=%{_datadir}/locale
 
 touch WindowMaker/Defaults/W*.in
 
@@ -289,7 +279,8 @@ cd %{name}-extra-%{extraver}
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmpropsdir}} \
-       $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
+       $RPM_BUILD_ROOT/etc/sysconfig/wmstyle \
+       $RPM_BUILD_ROOT%{_datadir}/WindowMaker/{Sounds,SoundSets}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -314,7 +305,7 @@ cd ..
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -324,19 +315,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
 
-
 %{_mandir}/man1/*
 %lang(sk) %{_mandir}/sk/man1/*
 
 %{_pixmapsdir}/*
 %{_wmpropsdir}/WindowMaker.desktop
 
+%attr(755,root,root) %{_bindir}/convertfonts
 %attr(755,root,root) %{_bindir}/bughint
 %attr(755,root,root) %{_bindir}/geticonset
 %attr(755,root,root) %{_bindir}/getstyle
 %attr(755,root,root) %{_bindir}/seticons
 %attr(755,root,root) %{_bindir}/setstyle
-%attr(755,root,root) %{_bindir}/wcopy
 %attr(755,root,root) %{_bindir}/wdwrite
 %attr(755,root,root) %{_bindir}/wdread
 %attr(755,root,root) %{_bindir}/wkdemenu.pl
@@ -346,9 +336,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/wmaker.inst
 %attr(755,root,root) %{_bindir}/wmsetbg
 %attr(755,root,root) %{_bindir}/wmsetup
-%attr(755,root,root) %{_bindir}/wmchlocale
-%attr(755,root,root) %{_bindir}/wpaste
-%attr(755,root,root) %{_bindir}/wsetfont
 %attr(755,root,root) %{_bindir}/wxcopy
 %attr(755,root,root) %{_bindir}/wxpaste
 %attr(755,root,root) %{_bindir}/dockit
@@ -357,7 +344,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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