X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=WindowMaker.spec;h=21c87b19a2a50f3446ee1b5187df7c64321e3a67;hb=fe4a8b5e02fa734f93f4d203217259a53795ed8e;hp=eb00ed284c6a6234494a94392c1cc65a79b13487;hpb=abf5e212b5efa1671e2281cccaa7d68dbb7a4670;p=packages%2FWindowMaker.git diff --git a/WindowMaker.spec b/WindowMaker.spec index eb00ed2..21c87b1 100644 --- 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,18 +9,20 @@ 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: 3 +Version: 0.81.0 +Release: 0.%{_snap}.10 License: GPL Group: X11/Window Managers -Source0: ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2 +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 -Source4: %{name}.RunWM -Source5: %{name}.wm_style +Source6: %{name}-xsession.desktop Patch0: %{name}-CFLAGS.patch -Patch1: %{name}-wmconfig.patch +Patch1: %{name}-vfmg.patch Patch2: %{name}-pixmaps.patch Patch3: %{name}-shared.patch Patch4: %{name}-areas.patch @@ -27,32 +30,31 @@ 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: XFree86-devel BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool BuildRequires: gettext-devel BuildRequires: libpng >= 1.0.8 BuildRequires: libjpeg-devel >= 6b BuildRequires: libtiff-devel +BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libungif-devel -BuildRequires: Hermes-devel -BuildRequires: XFree86-devel -Requires: wmconfig >= 0.9.9-5 +BuildRequires: xft-devel +Requires: %{name}-libs = %{version}-%{release} Requires: cpp -Requires: %{name}-libs = %{version} Requires: tk -Requires: xinitrc >= 3.0 +Requires: vfmg +Requires: xinitrc-ng BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man %define _sysconfdir /etc/X11 -%define _wmpropsdir %{_datadir}/wm-properties +%define _wmpropsdir /usr/share/wm-properties %description Window Maker is an X11 window manager which emulates the look and feel @@ -147,7 +149,9 @@ Summary(pt_BR): Arquivos de inclus Summary(ru): âÉÂÌÉÏÔÅËÉ ÐÏÄÄÅÒÖËÉ É .h ÆÁÊÌÙ ÄÌÑ WindowMaker Summary(uk): â¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÔÁ .h ÆÁÊÌÉ ÄÌÑ WindowMaker Group: Development/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} +Requires: XFree86-devel +Requires: xft-devel Obsoletes: libwraster2-devel %description devel @@ -186,15 +190,15 @@ Summary(ru): Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Ð¦ÄÔÒÉÍËÉ ÄÌÑ WindowMaker Group: Development/Libraries Summary(pt_BR): Componentes estáticos de desenvolvimento para o WindowMaker -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{version}-%{release} %description static This package contains static libraries for building WindowMaker-enhanced applications. %description static -l pl -Ten pakiet zawiera statyczne biblioteki niezbêdne do tworzenia -aplikacji wykorzystuj±cych mo¿liwo¶ci zarz±dcy 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, @@ -209,7 +213,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 @@ -219,36 +223,47 @@ 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 - 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 +# 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 -rm -f {,%{name}-extra-%{extraver}/}missing %{__libtoolize} %{__aclocal} -%{__autoconf} +%{__autoheader} %{__automake} -cd %{name}-extra-%{extraver} -%{__libtoolize} -%{__aclocal} %{__autoconf} -%{__automake} +cd %{name}-extra-%{extraver} + %{__libtoolize} + %{__aclocal} + %{__autoconf} + %{__automake} 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 \ @@ -263,8 +278,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}" @@ -276,12 +289,10 @@ cd %{name}-extra-%{extraver} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/pixmaps,%{_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} @@ -289,24 +300,24 @@ 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 WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir} install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir} -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh -install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names +install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop cd %{name}-extra-%{extraver} -%{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT cd .. %find_lang %{name} --all-name -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - %clean rm -rf $RPM_BUILD_ROOT +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README @@ -314,8 +325,6 @@ 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/* @@ -346,7 +355,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/dockit %{_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 @@ -365,12 +376,13 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la %attr(755,root,root) %{_bindir}/get-wings-flags %attr(755,root,root) %{_bindir}/get-wraster-flags %attr(755,root,root) %{_bindir}/get-wutil-flags +%attr(755,root,root) %{_libdir}/lib*.so +%{_libdir}/lib*.la %{_includedir}/* +%{_pkgconfigdir}/*.pc %files static %defattr(644,root,root,755)