From e5a452b39de7b36ddd09d7344dbbdfde97140a41 Mon Sep 17 00:00:00 2001 From: undefine Date: Tue, 26 Jul 2005 12:41:08 +0000 Subject: [PATCH] - up to 0.92.0 Changed files: WindowMaker-localenames.patch -> 1.4 WindowMaker-pl.po-update.patch -> 1.7 WindowMaker.spec -> 1.160 --- WindowMaker-localenames.patch | 12 ++++-------- WindowMaker-pl.po-update.patch | 12 ++++++------ WindowMaker.spec | 34 ++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/WindowMaker-localenames.patch b/WindowMaker-localenames.patch index a781089..f281783 100644 --- a/WindowMaker-localenames.patch +++ b/WindowMaker-localenames.patch @@ -11,16 +11,12 @@ POTFILES = \ --- WindowMaker-0.80.2/configure.ac.orig Fri Jan 30 15:16:44 2004 +++ WindowMaker-0.80.2/configure.ac Fri Jan 30 15:31:17 2004 -@@ -244,9 +244,9 @@ +@@ -281,7 +281,7 @@ dnl List of supported locales dnl ------------------------- --supported_locales="be bg bs ca 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" --supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW.Big5" --supported_wings_locales="bg ca cs de fr pl sk" +-supported_locales="be bg bs ca 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" +supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" -+supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW" -+supported_wings_locales="bg ca cs de fr pl sk" + supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW" + supported_wings_locales="bg ca cs de fr pl sk" - for lang in $LINGUAS; do - ok=0 diff --git a/WindowMaker-pl.po-update.patch b/WindowMaker-pl.po-update.patch index ddd85e3..ac42e6e 100644 --- a/WindowMaker-pl.po-update.patch +++ b/WindowMaker-pl.po-update.patch @@ -5230,15 +5230,15 @@ diff -Nur WindowMaker-0.80.2.orig/WPrefs.app/po/Makefile.am WindowMaker-0.80.2/W -#: ../src/xutil.c:228 -msgid "invalid data in selection" -msgstr "niewłaściwe dane w zaznaczeniu" ---- WindowMaker-0.80.2/configure.ac.orig Tue Mar 26 11:47:11 2002 -+++ WindowMaker-0.80.2/configure.ac Thu Nov 21 00:00:05 2002 -@@ -245,8 +245,8 @@ +--- WindowMaker-0.92.0/configure.ac.orig Tue Mar 26 11:47:11 2002 ++++ WindowMaker-0.92.0/configure.ac Thu Nov 21 00:00:05 2002 +@@ -282,8 +282,8 @@ dnl List of supported locales dnl ------------------------- - supported_locales="be bg bs ca 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" --supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5" + supported_locales="be bg bs ca 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" +-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" -supported_wings_locales="bg ca cs de fr sk" -+supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW.Big5" ++supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW" +supported_wings_locales="bg ca cs de fr pl sk" for lang in $LINGUAS; do diff --git a/WindowMaker.spec b/WindowMaker.spec index 32742ff..4be980f 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -8,12 +8,12 @@ Summary(pt_BR): Gerente de Janelas parecido com o NeXT Summary(ru): WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11 Summary(uk): WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11 Name: WindowMaker -Version: 0.91.0 -Release: 7 +Version: 0.92.0 +Release: 0.1 License: GPL Group: X11/Window Managers Source0: ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz -# Source0-md5: be07953e905d1e42fe7a65ac2193a5f9 +# Source0-md5: 678cb4a9b22a557cfb524dc3cb457c08 Source1: %{name}-data.tar.gz # Source1-md5: 6ea0c37314ea9e9ab27e8bdf45a31a82 Source2: ftp://ftp.windowmaker.org/pub/source/release/%{name}-extra-%{extraver}.tar.gz @@ -31,8 +31,7 @@ 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 +Patch11: %{name}-0.91.0-translucency-1.patch URL: http://www.windowmaker.org/ BuildRequires: XFree86-devel BuildRequires: autoconf @@ -226,7 +225,6 @@ utilizando componentes est %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 for f in WindowMaker/*menu*; do sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f @@ -242,6 +240,9 @@ mv -f po/{no,nb}.po %{__perl} -pi -e 's/test \$x86 = 1/false/' configure.ac %build +%ifarch %{x8664} +export ac_cv_c_inline_asm=no +%endif %{__libtoolize} %{__aclocal} %{__autoheader} @@ -267,7 +268,12 @@ cd .. --enable-static \ --enable-usermenu \ --with-appspath=%{_libdir}/GNUstep/Apps \ - --with-nlsdir=%{_datadir}/locale + --with-nlsdir=%{_datadir}/locale \ + --with-gnustepdir=%{_libdir}/GNUstep \ + --enable-sound \ + --enable-gnome \ + --enable-kde + touch WindowMaker/Defaults/W*.in @@ -349,15 +355,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xsessions/WindowMaker.desktop # the first one is shared with gnustep-make... -%dir %{_libdir}/GNUstep/Apps -%dir %{_libdir}/GNUstep/Apps/WPrefs.app +%dir %{_libdir}/GNUstep/Applications +%dir %{_libdir}/GNUstep/Applications/WPrefs.app -%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs +%attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs -%{_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 +%{_libdir}/GNUstep/Applications/WPrefs.app/tiff +%{_libdir}/GNUstep/Applications/WPrefs.app/xpm +%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.tiff +%{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.xpm %files libs %defattr(644,root,root,755) -- 2.44.0