X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=WindowMaker.spec;h=32742ff335a1bdd69a66446ccd5e6d4610696f20;hb=f7902ba1c8c248ab593eacf7dbc115671b6449d9;hp=4edd25902ac2fabf69a5007c5d333f5c57c84b99;hpb=b77d1e67405e53d905f62f553ed8f9e1ebf3a4e3;p=packages%2FWindowMaker.git

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 4edd259..32742ff 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,5 +1,4 @@
 %define		extraver	0.1
-%define		_snap		20040321
 
 Summary:	NeXT-alike window manager
 Summary(es):	Administrador de Ventanas parecido con el NeXT
@@ -9,51 +8,49 @@ Summary(pt_BR):	Gerente de Janelas parecido com o NeXT
 Summary(ru):	WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):	WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:		WindowMaker
-Version:	0.81.0
-Release:	0.%{_snap}.8
+Version:	0.91.0
+Release:	7
 License:	GPL
 Group:		X11/Window Managers
-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
+Source0:	ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.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
 Source3:	%{name}.desktop
-Source4:	%{name}.RunWM
-Source5:	%{name}.wm_style
 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
-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
+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
+Patch11:	%{name}-updateIconImage.patch
+Patch12:	%{name}-0.91.0-translucency-1.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
 BuildRequires:	libungif-devel
+BuildRequires:	perl-base
 BuildRequires:	xft-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	cpp
+Requires:	gnustep-dirs
 Requires:	tk
-Requires:	wmconfig >= 0.9.9-5
-Requires:	xinitrc >= 3.0
+Requires:	vfmg
+Requires:	xinitrc-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/X11
@@ -145,7 +142,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
@@ -216,7 +213,7 @@ utilizando componentes est
 ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÍÏÖÌÉ×ÏÓÔ¦ WindowMaker.
 
 %prep
-%setup -q -a 1 -a 2 -n %{name}-CVS-%{_snap}
+%setup -q -a 1 -a 2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -226,21 +223,17 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-#%patch10 -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/,%{_libdir}/GNUstep/, $f >$f.new
-	mv -f $f.new $f
+	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
@@ -261,23 +254,20 @@ 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 \
 	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
+	--enable-usermenu \
+	--with-appspath=%{_libdir}/GNUstep/Apps \
+	--with-nlsdir=%{_datadir}/locale
 
 touch WindowMaker/Defaults/W*.in
 
@@ -294,7 +284,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
@@ -307,8 +298,6 @@ install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
 
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.sh
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/wmaker.names
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
 cd %{name}-extra-%{extraver}
@@ -321,7 +310,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
@@ -331,21 +320,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/WindowMaker
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
 
-%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
-/etc/sysconfig/wmstyle/*.names
-
 %{_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
@@ -355,9 +341,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
@@ -366,7 +349,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