- don't disable xft configuration in WPrefs

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index cb180e125bf59d37b39f8c6ea2d615e0c02a6c10..f9543acb71ad15ea270df8af395899bfe8e1d203 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,162 +1,272 @@
 %define                extraver        0.1
 %define                extraver        0.1

+%define                _snap           20040321

 
 Summary:       NeXT-alike window manager
 
 Summary:       NeXT-alike window manager

+Summary(es):   Administrador de Ventanas parecido con el NeXT

 Summary(fr):   Gestionnaire de fenêtres avec le look NeXT
 Summary(fr):   Gestionnaire de fenêtres avec le look NeXT

-Summary(pl):   Mened¿er okien w stylu NeXT
+Summary(pl):   Zarz±dca okien w stylu NeXT
+Summary(pt_BR):        Gerente de Janelas parecido com o NeXT
+Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
+Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11

 Name:          WindowMaker
 Name:          WindowMaker

-Version:       0.61.1
-Release:       2
+Version:       0.81.0
+Release:       0.%{_snap}.11
+License:       GPL

 Group:         X11/Window Managers
 Group:         X11/Window Managers

-Group(pl):     X11/Zarz±dcy Okien
-Copyright:     GPL
-Source0:       ftp://ftp.windowmaker.org/pub/beta/srcs/%{name}-%{version}.tar.bz2
-Source1:       ftp://windowmaker.org/pub/WindowMaker-data.tar.gz
-Source2:       ftp://ftp.windowmaker.org/pub/beta/srcs/%{name}-extra-%{extraver}.tar.gz
-Source3:       WindowMaker.desktop
-Patch0:                WindowMaker-CFLAGS.patch
-Patch1:                WindowMaker-wmconfig.patch
-Patch2:                WindowMaker-a_macro.patch
-Patch3:                WindowMaker-pixmaps.patch
-Patch4:                WindowMaker-shared.patch
-Patch5:                WindowMaker-areas.patch
-Patch6:                WindowMaker-runinst.patch
-Patch7:                Windowmaker-WINGs.h.patch
-Patch8:                WindowMaker-singleclick.patch
-Patch9:                WindowMaker-cvs19991010.patch
-Patch10:       WindowMaker-plmenu.patch
-Patch11:       WindowMaker-dockit.patch
+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
+# Source2-md5: 07c7700daaaf232bc490f5abaabef085
+Source3:       %{name}.desktop
+Source6:       %{name}-xsession.desktop
+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}-CVS-before-xft2.patch

 URL:           http://www.windowmaker.org/
 URL:           http://www.windowmaker.org/

-BuildRequires: libPropList-devel >= 0.9.1
-BuildRequires: xpm-devel
-BuildRequires: libpng-devel
+BuildRequires: XFree86-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel
+BuildRequires: libpng >= 1.0.8

 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtiff-devel

+BuildRequires: libtool >= 1:1.4.2-9

 BuildRequires: libungif-devel
 BuildRequires: libungif-devel

-BuildRequires: gettext-devel
-Requires:      wmconfig
-Requires:      /lib/cpp
-Requires:      %{name}-libs = %{version}
+BuildRequires: xft-devel
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      cpp
+Requires:      tk
+Requires:      vfmg
+Requires:      xinitrc-ng

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man

 %define                _sysconfdir     /etc/X11
 %define                _sysconfdir     /etc/X11

+%define                _wmpropsdir     /usr/share/wm-properties

 
 %description
 
 %description

-Window Maker is an X11 window manager which emulates the look and feel of
-the NeXTSTEP (TM) graphical user interface. It is relatively fast, feature
-rich and easy to configure and use.  Window Maker is part of the official
-GNU project, which means that Window Maker can interoperate with other GNU
-projects, such as GNOME.
-
-Window Maker allows users to switch themes 'on the fly,' to place favorite
-applications on either an application dock, similar to AfterStep's Wharf or
-on a workspace dock, a 'clip' which extends the application dock's
-usefulness.
-
-You should install the WindowMaker package if you use Window Maker as your
-window manager or if you'd like to try using it. If you do install the
-WindowMaker package, you may also want to install the AfterStep-APPS
-package, which includes applets that will work with both AfterStep and
-Window Maker window managers.
+Window Maker is an X11 window manager which emulates the look and feel
+of the NeXTSTEP (TM) graphical user interface. It is relatively fast,
+feature rich and easy to configure and use. Window Maker is part of
+the official GNU project, which means that Window Maker can
+interoperate with other GNU projects, such as GNOME.
+
+Window Maker allows users to switch themes 'on the fly,' to place
+favorite applications on either an application dock, similar to
+AfterStep's Wharf or on a workspace dock, a 'clip' which extends the
+application dock's usefulness.
+
+You should install the WindowMaker package if you use Window Maker as
+your window manager or if you'd like to try using it. If you do
+install the WindowMaker package, you may also want to install the
+AfterStep-APPS package, which includes applets that will work with
+both AfterStep and Window Maker window managers.
+
+%description -l es
+WindowMaker es un administrador de ventanas proyectado para emular la
+apariencia de parte de la interface de usuario del NEXTSTEP(tm). Se
+hizo para ser rápido, relativamente pequeño, rico en características y
+de configuración fácil, con una apariencia sencilla y elegante
+prestada del NEXTSTEP(tm).

 
 %description -l fr
 Window Maker est un gestionnaire de fenêtres pour X11 qui cherche à
 
 %description -l fr
 Window Maker est un gestionnaire de fenêtres pour X11 qui cherche à

-reproduire l'allure et l'ergonomie ("look & feel") de l'interface graphique
-NeXTSTEP(tm) (aka OpenStep). Il est relativement rapide, évolué, et facile à
-configurer et à utiliser. Window Maker fait officiellement partie du projet
-GNU, ce qui signifie que Window Maker peut coopérer avec d'autres projets
-GNU, comme par exemple GNOME.
+reproduire l'allure et l'ergonomie ("look & feel") de l'interface
+graphique NeXTSTEP(tm) (aka OpenStep). Il est relativement rapide,
+évolué, et facile à configurer et à utiliser. Window Maker fait
+officiellement partie du projet GNU, ce qui signifie que Window Maker
+peut coopérer avec d'autres projets GNU, comme par exemple GNOME.

 
 Window Maker permet de changer de thèmes facilement, de placer ses
 
 Window Maker permet de changer de thèmes facilement, de placer ses

-applications favorites soit sur un "dock" similaire au programme Wharf de
-AfterStep, soit sur un dock intégré à l'espace de travail, appelé "clip"
-(trombone), et qui permet d'étendre les possibilités du dock principal.
-
-Vous devriez installer ce package si votre gestionnaire de fenêtres est
-Window Maker, ou si vous voulez l'essayer. Si vous installez le package
-Window Maker, vous voudrez peut-être installer aussi le package
-AfterStep-APPS, qui contient des "applets" (petites applications) qui
-fonctionnent à la fois dans les gestionnaires de fenêtres AfterStep et
-Window Maker.
+applications favorites soit sur un "dock" similaire au programme Wharf
+de AfterStep, soit sur un dock intégré à l'espace de travail, appelé
+"clip" (trombone), et qui permet d'étendre les possibilités du dock
+principal.
+
+Vous devriez installer ce package si votre gestionnaire de fenêtres
+est Window Maker, ou si vous voulez l'essayer. Si vous installez le
+package Window Maker, vous voudrez peut-être installer aussi le
+package AfterStep-APPS, qui contient des "applets" (petites
+applications) qui fonctionnent à la fois dans les gestionnaires de
+fenêtres AfterStep et Window Maker.

 
 %description -l pl
 
 %description -l pl

-WindowMaker jest mened¿erem okien przypominaj±cym wygl±dem i wygod± obs³ugi
-interfejs systemu NeXTSTEP(tm). Jest szybki, stosunkowo ma³y, o du¿ych
-mo¿liwo¶ciach i ³atwy w konfiguracji. Konfiguruje siê go myszk±, za pomoc±
-programu WPrefs wchodz±cego w sk³ad tego pakietu.
+WindowMaker jest zarz±dc± okien przypominaj±cym wygl±dem i wygod±
+obs³ugi interfejs systemu NeXTSTEP(tm). Jest szybki, stosunkowo ma³y,
+o du¿ych mo¿liwo¶ciach i ³atwy w konfiguracji. Konfiguruje siê go
+myszk±, za pomoc± programu WPrefs wchodz±cego w sk³ad tego pakietu.
+
+%description -l pt_BR
+WindowMaker é um gerente de janelas projetado para emular a aparência
+de parte da interface de usuário do NEXTSTEP(tm). Feito para ser
+rápido, relativamente pequeno, rico em características e de
+configuração fácil, com uma aparência simples e elegante emprestada do
+NEXTSTEP(tm).
+
+%description -l ru
+WindowMaker - ÜÔÏ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ, ÜÍÕÌÉÒÕÀÝÉÊ ÞÁÓÔØ ÜËÒÁÎÎÏÊ ÓÒÅÄÙ
+NEXTSTEP(tm). ðÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ ÞÔÏ ÏÎ ÏÔÎÏÓÉÔÅÌØÎÏ ÎÅ×ÅÌÉË, ÂÙÓÔÒ,
+ÂÏÇÁÔ ×ÏÚÍÏÖÎÏÓÔÑÍÉ, ÌÅÇËÏ ÎÁÓÔÒÁÉ×ÁÅÔÓÑ É ÉÍÅÅÔ ÐÒÏÓÔÕÀ É ÜÌÅÇÁÎÔÎÕÀ
+×ÎÅÛÎÏÓÔØ, ÐÏÚÁÉÍÓÔ×Ï×ÁÎÎÕÀ Õ NEXTSTEP(tm).
+
+%description -l uk
+WindowMaker - ÊצËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ, ÝÏ ÅÍÕÌÀ¤ ¦ÎÔÅÒÆÅÊÓ ÅËÒÁÎÎÏÇÏ
+ÓÅÒÅÄÏ×ÉÝÁ NEXTSTEP(tm). êÏÇÏ ××ÁÖÁÀÔØ ×¦ÄÎÏÓÎÏ ÎÅ×ÅÌÉËÉÍ, Û×ÉÄËÉÍ,
+ÂÁÇÁÔÉÍ ÍÏÖÌÉ×ÏÓÔÑÍÉ, ÌÅÇËÉÍ ÄÌÑ ÎÁÌÁÇÏÄÖÅÎÎÑ; צΠÍÁ¤ ÐÒÏÓÔÕ ÔÁ
+ÅÌÅÇÁÎÔÎÕ ÚÏ×ΦÛΦÓÔØ, ÚÁÐÏÚÉÞÅÎÕ × NEXTSTEP(tm).

 
 %package libs
 Summary:       WindowMaker shared libraries
 Summary(pl):   Biblioteki wspó³dzielone WindowMakera
 Group:         Libraries
 
 %package libs
 Summary:       WindowMaker shared libraries
 Summary(pl):   Biblioteki wspó³dzielone WindowMakera
 Group:         Libraries

-Group(pl):     Biblioteki
+Obsoletes:     libwraster2

 
 %description libs
 This package contains shared libraries for run WindowMaker.
 
 %description libs -l pl
 Ten pakiet zawiera biblioteki wspó³dzielone niezbêdne do pracy
 
 %description libs
 This package contains shared libraries for run WindowMaker.
 
 %description libs -l pl
 Ten pakiet zawiera biblioteki wspó³dzielone niezbêdne do pracy

-mened¿era okien WindowMaker.
+zarz±dcy okien WindowMaker.

 
 %package devel
 
 %package devel

-Summary:       WindowMaker libraries
+Summary:       WindowMaker libraries - development part
+Summary(es):   Bibliotecas, archivos de inclusión, e etc. para desarrollar aplicaciones WindowMaker

 Summary(fr):   Librairies de WindowMaker
 Summary(fr):   Librairies de WindowMaker

-Summary(pl):   Biblioteki WindowMakera
+Summary(pl):   Biblioteki WindowMakera - czê¶æ dla programistów
+Summary(pt_BR):        Arquivos de inclusão e bibliotecas para o WindowMaker
+Summary(ru):   âÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ É .h ÆÁÊÌÙ ÄÌÑ WindowMaker
+Summary(uk):   â¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker

 Group:         Development/Libraries
 Group:         Development/Libraries

-Group(pl):     Programowanie/Biblioteki
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      XFree86-devel
+Requires:      xft-devel
+Obsoletes:     libwraster2-devel

 
 %description devel
 This package contains libraries for building WindowMaker-enhanced
 applications.
 
 
 %description devel
 This package contains libraries for building WindowMaker-enhanced
 applications.
 

+%description devel -l es
+Bibliotecas, archivos de inclusión, e etc. para desarrollar
+aplicaciones WindowMaker
+

 %description devel -l fr
 %description devel -l fr

-Ce paquet contient des librairies pour faire des applications mise en valeur
-par WindowMaker.
+Ce paquet contient des librairies pour faire des applications mise en
+valeur par WindowMaker.

 
 %description devel -l pl
 
 %description devel -l pl

-Ten pakiet zawiera pliki nag³ówkowe i biblioteki niezbêdne do tworzenia
-aplikacji wykorzystuj±cych mo¿liwo¶ci mened¿era okien WindowMaker.
+Ten pakiet zawiera pliki nag³ówkowe i biblioteki niezbêdne do
+tworzenia aplikacji wykorzystuj±cych mo¿liwo¶ci zarz±dcy okien
+WindowMaker.
+
+%description devel -l pt_BR
+Arquivos de inclusão e bibliotecas para o desenvolvimento de programas
+baseados no WindowMaker
+
+%description devel -l ru
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÂÉÂÌÉÏÔÅËÉ É .h ÆÁÊÌÙ, ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÅ ÄÌÑ ÓÂÏÒËÉ
+ÐÒÉÌÏÖÅÎÉÊ, ÉÓÐÏÌØÚÕÀÝÉÈ ×ÏÚÍÏÖÎÏÓÔÉ WindowMaker.
+
+%description devel -l uk
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÔÁ .h ÆÁÊÌÉ, ÐÒÉÚÎÁÞÅΦ ÄÌÑ ÐÒÉËÌÁÄÎÉÈ
+ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.

 
 %package static
 Summary:       WindowMaker static libraries
 Summary(pl):   Biblioteki statyczne WindowMakera
 
 %package static
 Summary:       WindowMaker static libraries
 Summary(pl):   Biblioteki statyczne WindowMakera

+Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ ÄÌÑ WindowMaker
+Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÄÌÑ WindowMaker

 Group:         Development/Libraries
 Group:         Development/Libraries

-Group(pl):     Programowanie/Biblioteki
-Requires:      %{name}-devel = %{version}
+Summary(pt_BR):        Componentes estáticos de desenvolvimento para o WindowMaker
+Requires:      %{name}-devel = %{version}-%{release}

 
 %description static
 
 %description static

-This package contains static libraries for building WindowMaker-enhanced
-applications.
+This package contains static libraries for building
+WindowMaker-enhanced applications.

 
 %description static -l pl
 
 %description static -l pl

-Ten pakiet zawiera statyczne biblioteki niezbêdne do tworzenia
-aplikacji wykorzystuj±cych mo¿liwo¶ci menad¿era okien WindowMaker.
+Ten pakiet zawiera statyczne biblioteki do tworzenia aplikacji
+wykorzystuj±cych mo¿liwo¶ci zarz±dcy okien WindowMaker.
+
+%description static -l pt_BR
+Instale este pacote se você deseja desenvolver para o WindowMaker,
+utilizando componentes estáticos (raramente necessário).
+
+%description static -l ru
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÅ ÄÌÑ ÓÂÏÒËÉ
+ÐÒÉÌÏÖÅÎÉÊ, ÉÓÐÏÌØÚÕÀÝÉÈ ×ÏÚÍÏÖÎÏÓÔÉ WindowMaker.
+
+%description static -l uk
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÐÒÉÚÎÁÞÅΦ ÄÌÑ ÐÒÉËÌÁÄÎÉÈ
+ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.

 
 %prep
 
 %prep

-%setup -q -a 1 -a 2
+%setup -q -a 1 -a 2 -n %{name}-CVS-%{_snap}

 %patch0 -p1
 %patch0 -p1

-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1

 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1

-%patch9 -p1
-%patch10 -p1

 %patch11 -p1
 %patch11 -p1

+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p0
+
+for f in WindowMaker/*menu*; do
+       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
 
 %build

-autoconf
-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" ; export LINGUAS
-CPP_PATH="/lib/cpp" ; export CPP_PATH
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+cd %{name}-extra-%{extraver}
+       %{__libtoolize}
+       %{__aclocal}
+       %{__autoconf}
+       %{__automake}
+cd ..
+
+perl -pi -e 's/defaultAppIcon.#extension#;SharedAppIcon = Yes;/defaultAppIcon.#extension#;/' \
+       WindowMaker/Defaults/WMWindowAttributes.in

 
 %configure \
 
 %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-nlsdir=%{_datadir}/locale \

+       --with-appspath=%{_libdir}/GNUstep/Apps \

        --enable-sound \
        --enable-gnome \
        --disable-debug \
        --enable-sound \
        --enable-gnome \
        --disable-debug \


@@ -167,95 +277,97 @@ CPP_PATH="/lib/cpp" ; export CPP_PATH
 
 touch WindowMaker/Defaults/W*.in
 
 
 touch WindowMaker/Defaults/W*.in
 

-make \
-       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" \
-       CFLAGS="$RPM_OPT_FLAGS" \
-       LDFLAGS="-s" 
+%{__make} \
+       CFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags}"

 
 

-autoconf
+%{__autoconf}

 cd %{name}-extra-%{extraver}
 cd %{name}-extra-%{extraver}

-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target_platform} \
-       --prefix=%{_prefix} \
-       --mandir=%{_mandir} \
+%configure \

        --with-nlsdir=%{_datadir}/locale \
        --with-iconsdir=%{_datadir}/pixmaps
 
 %install
 rm -rf $RPM_BUILD_ROOT
        --with-nlsdir=%{_datadir}/locale \
        --with-iconsdir=%{_datadir}/pixmaps
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_datadir}/{pixmaps,gnome/wm-properties}
+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 
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT

 
 install util/bughint $RPM_BUILD_ROOT%{_bindir}
 
 install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
 install util/bughint $RPM_BUILD_ROOT%{_bindir}
 
 install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 

-install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}

 
 

-(cd %{name}-extra-%{extraver};
-make DESTDIR=$RPM_BUILD_ROOT install )
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop

 
 

-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*so.*.*
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
-
-%find_lang %{name}
-%find_lang WPrefs
-cat WPrefs.lang >> %{name}.lang
+cd %{name}-extra-%{extraver}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+cd ..

 
 

-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%find_lang %{name} --all-name

 
 %clean
 
 %clean

-rm -r $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc {AUTHORS,BUGFORM,BUGS,ChangeLog,FAQ,NEWS,README}.gz
+%doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
+
+%dir %{_sysconfdir}/WindowMaker
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*

 
 

-%dir /etc/X11/WindowMaker
-%config %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*

 
 %{_mandir}/man1/*
 
 %{_mandir}/man1/*

+%lang(sk) %{_mandir}/sk/man1/*

 
 

-%{_datadir}/pixmaps/*
-%{_datadir}/gnome/wm-properties/WindowMaker.desktop
+%{_pixmapsdir}/*
+%{_wmpropsdir}/WindowMaker.desktop

 
 

+%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}/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}/wdwrite

+%attr(755,root,root) %{_bindir}/wdread

 %attr(755,root,root) %{_bindir}/wkdemenu.pl
 %attr(755,root,root) %{_bindir}/wm-oldmenu2new
 %attr(755,root,root) %{_bindir}/wkdemenu.pl
 %attr(755,root,root) %{_bindir}/wm-oldmenu2new

+%attr(755,root,root) %{_bindir}/wmagnify

 %attr(755,root,root) %{_bindir}/wmaker
 %attr(755,root,root) %{_bindir}/wmaker.inst
 %attr(755,root,root) %{_bindir}/wmsetbg
 %attr(755,root,root) %{_bindir}/wmaker
 %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
 
 %{_datadir}/WindowMaker
 %attr(755,root,root) %{_bindir}/wsetfont
 %attr(755,root,root) %{_bindir}/wxcopy
 %attr(755,root,root) %{_bindir}/wxpaste
 %attr(755,root,root) %{_bindir}/dockit
 
 %{_datadir}/WindowMaker

+%{_datadir}/xsessions/WindowMaker.desktop

 
 

-%dir %{_prefix}/GNUstep
-%dir %{_prefix}/GNUstep/Apps
-%dir %{_prefix}/GNUstep/Apps/WPrefs.app
+# the first one is shared with gnustep-make...
+%dir %{_libdir}/GNUstep
+%dir %{_libdir}/GNUstep/Apps
+%dir %{_libdir}/GNUstep/Apps/WPrefs.app

 
 

-%attr(755,root,root) %{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs
+%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs

 
 

-%{_prefix}/GNUstep/Apps/WPrefs.app/tiff
-%{_prefix}/GNUstep/Apps/WPrefs.app/xpm
-%{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
-%{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
+%{_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

 
 %files libs
 %defattr(644,root,root,755)
 
 %files libs
 %defattr(644,root,root,755)


@@ -264,10 +376,13 @@ rm -r $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_bindir}/get-wings-flags

 %attr(755,root,root) %{_bindir}/get-wraster-flags
 %attr(755,root,root) %{_bindir}/get-wraster-flags

-%{_includedir}/*.h
+%attr(755,root,root) %{_bindir}/get-wutil-flags
+%attr(755,root,root) %{_libdir}/lib*.so

 %{_libdir}/lib*.la
 %{_libdir}/lib*.la

+%{_includedir}/*
+%{_pkgconfigdir}/*.pc

 
 %files static
 %defattr(644,root,root,755)
 
 %files static
 %defattr(644,root,root,755)