- updated to 0.80.1 (many bugfixes)

- updated wmconfig patch, updated LINGUAS, removed libpng 1.2.2 hack, new %%doc
- added po patch (fix for zh_TW multi-byte sequences, hr encoding name and one
  pl fuzzy entry)
- added missing binaries (wcopy,wpaste,wmsetup) and sk man pages
- License is just GPL (version 2 or any later), not only v2

Changed files:
    WindowMaker-po.patch -> 1.1
    WindowMaker-wmconfig.patch -> 1.5
    WindowMaker.spec -> 1.98

diff --git a/WindowMaker-po.patch b/WindowMaker-po.patch
new file mode 100644 (file)
index 0000000..aa6d0f0
--- /dev/null
+++ b/WindowMaker-po.patch
@@ -0,0 +1,125 @@
+--- WindowMaker-0.80.1/po/zh_TW.Big5.po.orig   Tue Jan  8 14:45:06 2002
++++ WindowMaker-0.80.1/po/zh_TW.Big5.po        Mon Jul 15 20:22:27 2002
+@@ -519,8 +519,7 @@
+ "is docked in the same positions on the other workspaces and the Clip is not "
+ "full in some workspace."
+ msgstr ""
+-"¬Y¨Ç¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬"
+-"Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C"
++"¬Y¨Ç¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C"
+ 
+ #: ../src/dock.c:529
+ msgid ""
+@@ -528,8 +527,7 @@
+ "docked in the same position on the other workspaces and the Clip is not full "
+ "in some workspace."
+ msgstr ""
+-"¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤"
+-"u§@°Ïªº°j¯¾°w¥¼º¡¡C"
++"¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C"
+ 
+ #: ../src/dock.c:556
+ msgid "Workspace Clip"
+@@ -1142,13 +1140,13 @@
+ msgid ""
+ "There are more than one WORKSPACE_MENU commands in the applications menu. "
+ "Only one is allowed."
+-msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C"
++msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\¤@­Ó¡C"
+ 
+ #: ../src/rootmenu.c:834
+ msgid ""
+ "There are more than one WINDOWS_MENU commands in the applications menu. Only "
+ "one is allowed."
+-msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WINDOWS_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C"
++msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WINDOWS_MENU ©R¥O¡C¥u¤¹³\¤@­Ó¡C"
+ 
+ #: ../src/rootmenu.c:839
+ msgid "Window List"
+@@ -1502,11 +1500,11 @@
+ #: ../src/winspector.c:1121
+ #, c-format
+ msgid "Inspecting  %s.%s"
+-msgstr "À˾\\  %s.%s"
++msgstr "À˾\  %s.%s"
+ 
+ #: ../src/winspector.c:1147
+ msgid "Click in the window you wish to inspect."
+-msgstr "¦b§A·QÀ˾\\ªºµøµ¡ÂI¤@¤U"
++msgstr "¦b§A·QÀ˾\ªºµøµ¡ÂI¤@¤U"
+ 
+ #: ../src/winspector.c:1186
+ msgid ""
+@@ -1620,7 +1618,7 @@
+ msgid ""
+ "Keep the window over other windows, not allowing\n"
+ "them to cover it."
+-msgstr "Åýµøµ¡«O«ù¦b¨ä¥Lµøµ¡¤§¤W¡A¤£³\\¥¦­ÌÂл\\¥¦¡C"
++msgstr "Åýµøµ¡«O«ù¦b¨ä¥Lµøµ¡¤§¤W¡A¤£³\¥¦­ÌÂл\¥¦¡C"
+ 
+ #: ../src/winspector.c:1370
+ msgid "Keep at bottom (sunken)"
+@@ -1682,7 +1680,7 @@
+ "of your shortcut configuration."
+ msgstr ""
+ "·í¦¹µøµ¡±o¨ìµJÂI®É¤£­n±q Window Maker µ²¦XÁä½L±¶®|¡C\n"
+-"³o¤¹³\\µøµ¡±o¨ì©Ò¦³Áä½L²Õ¦X¤£²z·|§Aªº±¶®|³]©w¡C"
++"³o¤¹³\µøµ¡±o¨ì©Ò¦³Áä½L²Õ¦X¤£²z·|§Aªº±¶®|³]©w¡C"
+ 
+ #: ../src/winspector.c:1436
+ msgid "Do not bind mouse clicks"
+@@ -1720,7 +1718,7 @@
+ msgid ""
+ "Do not allow the window to move itself completely\n"
+ "outside the screen. For bug compatibility.\n"
+-msgstr "¤£¤¹³\\µøµ¡§¹¥þ²¾¥X¿Ã¹õ¡C¥Î©ó¿ù»~¬Û®e©Ê¡C\n"
++msgstr "¤£¤¹³\µøµ¡§¹¥þ²¾¥X¿Ã¹õ¡C¥Î©ó¿ù»~¬Û®e©Ê¡C\n"
+ 
+ #: ../src/winspector.c:1460
+ msgid "Ignore 'Hide Others'"
+--- WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po.orig        Tue Jan  8 14:44:42 2002
++++ WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po     Mon Jul 15 20:44:04 2002
+@@ -1887,11 +1887,11 @@
+ 
+ #: ../../WPrefs.app/WindowHandling.c:366
+ msgid "...do not cover icons"
+-msgstr "...¤£­nÂл\\¹Ï¥Ü"
++msgstr "...¤£­nÂл\¹Ï¥Ü"
+ 
+ #: ../../WPrefs.app/WindowHandling.c:372
+ msgid "...do not cover dock"
+-msgstr "...¤£­nÂл\\°±¾a°Ï"
++msgstr "...¤£­nÂл\°±¾a°Ï"
+ 
+ #: ../../WPrefs.app/WindowHandling.c:381
+ msgid "Edge Resistance"
+--- WindowMaker-0.80.1/WPrefs.app/po/hr.po.orig        Mon Jan 25 20:06:53 1999
++++ WindowMaker-0.80.1/WPrefs.app/po/hr.po     Mon Jul 15 20:44:35 2002
+@@ -3,7 +3,7 @@
+ "Date: 1998-08-24 14:36:41-0300\n"
+ "From: Toni Biliæ tbilic@oliver.efos.hr \n"
+ "Language-Team: Croatian \n"
+-"Content-Type: text/plain; charset=ISO8859-2\n"
++"Content-Type: text/plain; charset=iso-8859-2\n"
+ "Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n"
+ "Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n"
+ 
+--- WindowMaker-0.80.1/po/pl.po.orig   Wed Feb 17 12:06:47 1999
++++ WindowMaker-0.80.1/po/pl.po        Mon Jul 15 20:45:25 2002
+@@ -5,7 +5,6 @@
+ # Copyright (C) 1999 Free Software Foundation, Inc.
+ # Piotr Dembiñski <pdemb@fanthom.math.put.poznan.pl>, 1998.
+ #
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+@@ -100,7 +99,7 @@
+ msgstr "nie mo¿na za³adowaæ domeny %s z globalnej bazy danych"
+ 
+ #: ../src/defaults.c:1266
+-#, c-format, fuzzy
++#, c-format
+ msgid "wrong option value for key \"%s\". Should be one of %s"
+ msgstr "niew³a¶ciwa warto¶æ dla klucza \"%s\". Powinno byæ jedno z: %s"
+ 

diff --git a/WindowMaker-wmconfig.patch b/WindowMaker-wmconfig.patch
index f95413bfe0e3b5b6181477f0cd83d8054254e861..152fa27411d95cd96ad176262827e3ecf697c6d0 100644 (file)
--- a/WindowMaker-wmconfig.patch
+++ b/WindowMaker-wmconfig.patch
@@ -1,6 +1,7 @@
---- WindowMaker/menu~  Sun May 30 23:25:19 1999
-+++ WindowMaker/menu   Fri Jun 25 16:16:10 1999
-@@ -113,48 +113,10 @@
+diff -Nur WindowMaker-0.80.1.orig/WindowMaker/menu WindowMaker-0.80.1/WindowMaker/menu
+--- WindowMaker-0.80.1.orig/WindowMaker/menu   Tue Jul  2 02:30:25 2002
++++ WindowMaker-0.80.1/WindowMaker/menu        Mon Jul 15 19:51:47 2002
+@@ -116,49 +116,10 @@
                "Process List" EXEC xterm -e top
                "Manual Browser" EXEC xman
        "Info" END
@@ -25,7 +26,8 @@
 -      "Applications" END
 -      "Editors" MENU
 -              "XFte" EXEC xfte
--              "XEmacs" SHEXEC xemacs || emacs
+-              "XEmacs" EXEC xemacs
+-              "Emacs" EXEC emacs
 -              "XJed" EXEC xjed 
 -              "NEdit" EXEC nedit
 -              "Xedit" EXEC xedit
@@ -50,9 +52,10 @@
  
        "Selection" MENU
                "Copy" SHEXEC echo '%s' | wxcopy
---- WindowMaker/plmenu~        Sun May 30 23:25:19 1999
-+++ WindowMaker/plmenu Fri Jun 25 16:14:06 1999
-@@ -11,45 +11,7 @@
+diff -Nur WindowMaker-0.80.1.orig/WindowMaker/plmenu WindowMaker-0.80.1/WindowMaker/plmenu
+--- WindowMaker-0.80.1.orig/WindowMaker/plmenu Tue Jul  2 02:30:25 2002
++++ WindowMaker-0.80.1/WindowMaker/plmenu      Mon Jul 15 19:52:58 2002
+@@ -11,46 +11,7 @@
   ("XTerm", EXEC, "xterm -sb"),
   ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
   ("Workspaces", WORKSPACE_MENU),
@@ -73,7 +76,8 @@
 -  ),
 - ("Editors",
 -  ("XFte", EXEC, "xfte"),
--  ("XEmacs", SHEXEC, "xemacs || emacs"),
+-  ("XEmacs", EXEC, "xemacs"),
+-  ("Emacs", EXEC, "emacs"),
 -  ("XJed", EXEC, "xjed"),
 -  ("NEdit", EXEC, "nedit"),
 -  ("Xedit", EXEC, "xedit"),

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 3c5b73c87efdec01eeab6bcbe7909a737804d460..69351a61be9d31fb3ed128074cca2a973543e51e 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -8,9 +8,9 @@ Summary(pt_BR): Gerente de Janelas parecido com o NeXT
 Summary(ru):   WindowMaker - ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
-Version:       0.80.0
-Release:       10
-License:       GPL2
+Version:       0.80.1
+Release:       1
+License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
 Source1:       ftp://windowmaker.org/pub/%{name}-data.tar.gz
@@ -27,6 +27,7 @@ Patch5:               %{name}-IconPosition.patch
 Patch6:                %{name}-singleclick.patch
 Patch7:                %{name}-plmenu.patch
 Patch8:                %{name}-dockit.patch
+Patch9:                %{name}-po.patch
 URL:           http://www.windowmaker.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -207,7 +208,7 @@ utilizando componentes est
 %prep
 %setup -q -a 1 -a 2
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -215,6 +216,7 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 for f in WindowMaker/*menu*; do
        sed s,/usr/local/GNUstep/,/usr/X11R6/lib/GNUstep/, $f >$f.new
@@ -233,14 +235,10 @@ aclocal
 %{__automake}
 cd ..
 
-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
+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
-
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
-       CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
-%configure CPPFLAGS="$CPPFLAGS" \
+%configure \
        --with-nlsdir=%{_datadir}/locale \
        --with-appspath=%{_libdir}/GNUstep/Apps \
        --enable-sound \
@@ -254,8 +252,8 @@ fi
 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" \
+       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}"
 
@@ -290,8 +288,6 @@ cd %{name}-extra-%{extraver}
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
-gzip -9nf AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
-
 %find_lang %{name} --all-name
 
 %post   libs -p /sbin/ldconfig
@@ -302,7 +298,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS BUGFORM BUGS ChangeLog FAQ NEWS README
 
 %dir %{_sysconfdir}/WindowMaker
 %config %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/*
@@ -311,6 +307,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/wmstyle/*.names
 
 %{_mandir}/man1/*
+%lang(sk) %{_mandir}/sk/man1/*
 
 %{_pixmapsdir}/*
 %{_wmpropsdir}/WindowMaker.desktop
@@ -320,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -328,7 +326,9 @@ rm -rf $RPM_BUILD_ROOT
 %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