+++ /dev/null
---- FSViewer.app-0.2.3/src/FSViewer.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/FSViewer.c Mon Sep 17 18:53:43 2001
-@@ -3,7 +3,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <X11/Xlocale.h>
- #include <X11/keysym.h>
-
---- FSViewer.app-0.2.3/src/FSViewer.h~ Sat Oct 9 20:59:19 1999
-+++ FSViewer.app-0.2.3/src/FSViewer.h Mon Sep 17 18:54:40 2001
-@@ -12,8 +12,8 @@
- #include <proplist.h>
- #include <wraster.h>
-
--#include <WINGs.h>
--#include <WUtil.h>
-+#include <WINGs/WINGs.h>
-+#include <WINGs/WUtil.h>
-
- #include "files.h"
-
---- FSViewer.app-0.2.3/src/DnD.c~ Sat Oct 9 20:45:23 1999
-+++ FSViewer.app-0.2.3/src/DnD.c Mon Sep 17 19:03:53 2001
-@@ -15,7 +15,7 @@
- Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <X11/Xatom.h>
- #include <X11/Xmu/WinUtil.h>
- #include <X11/cursorfont.h>
---- FSViewer.app-0.2.3/src/FSBrowser.c~ Sat Oct 9 20:48:23 1999
-+++ FSViewer.app-0.2.3/src/FSBrowser.c Mon Sep 17 19:04:21 2001
-@@ -1,5 +1,5 @@
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <math.h> /* for : double rint (double) */
-
- #include "FSBrowser.h"
---- FSViewer.app-0.2.3/src/FSFileButton.c~ Sat Oct 9 20:45:23 1999
-+++ FSViewer.app-0.2.3/src/FSFileButton.c Mon Sep 17 19:04:42 2001
-@@ -7,7 +7,7 @@
- *****************************************************************************/
-
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <sys/stat.h>
- #include <unistd.h>
-
---- FSViewer.app-0.2.3/src/FSFileView.c~ Sat Oct 9 20:45:21 1999
-+++ FSViewer.app-0.2.3/src/FSFileView.c Mon Sep 17 19:05:11 2001
-@@ -4,7 +4,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <X11/Xlocale.h>
- #include <X11/keysym.h>
- #include <sys/stat.h>
---- FSViewer.app-0.2.3/src/FSMCList.c~ Sun Oct 10 16:10:56 1999
-+++ FSViewer.app-0.2.3/src/FSMCList.c Mon Sep 17 19:06:02 2001
-@@ -1,5 +1,5 @@
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <grp.h>
- #include <pwd.h>
- #include <sys/types.h>
---- FSViewer.app-0.2.3/src/FSFinder.c~ Sat Oct 9 20:45:24 1999
-+++ FSViewer.app-0.2.3/src/FSFinder.c Mon Sep 17 19:05:34 2001
-@@ -4,7 +4,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <X11/Xlocale.h>
- #include <X11/keysym.h>
- #include <sys/stat.h>
---- FSViewer.app-0.2.3/src/FSMenu.c~ Sat Oct 9 20:45:21 1999
-+++ FSViewer.app-0.2.3/src/FSMenu.c Mon Sep 17 19:06:26 2001
-@@ -1,4 +1,4 @@
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
-
- #include "files.h"
- #include "FSFileButton.h"
---- FSViewer.app-0.2.3/src/FSPanel.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/FSPanel.c Mon Sep 17 19:06:41 2001
-@@ -2,7 +2,7 @@
-
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include "config.h"
- #include "FSViewer.h"
- #include "FSUtils.h"
---- FSViewer.app-0.2.3/src/FSPathView.c~ Sat Oct 9 20:45:24 1999
-+++ FSViewer.app-0.2.3/src/FSPathView.c Mon Sep 17 19:06:57 2001
-@@ -1,5 +1,5 @@
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <math.h> /* for : double rint (double) */
-
- #include "files.h"
---- FSViewer.app-0.2.3/src/FSPrefs.c~ Sat Oct 9 20:45:24 1999
-+++ FSViewer.app-0.2.3/src/FSPrefs.c Mon Sep 17 19:07:15 2001
-@@ -1,6 +1,6 @@
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
-
- #include "FSViewer.h"
- #include "FSUtils.h"
---- FSViewer.app-0.2.3/src/FSUtils.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/FSUtils.c Mon Sep 17 19:07:32 2001
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <unistd.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <wraster.h>
- #include <X11/cursorfont.h>
-
---- FSViewer.app-0.2.3/src/files.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/files.c Mon Sep 17 19:29:46 2001
-@@ -11,8 +11,8 @@
- #include <errno.h>
- #include <dirent.h>
- #include <stdarg.h>
--#include <WINGs.h>
--#include <WUtil.h>
-+#include <WINGs/WINGs.h>
-+#include <WINGs/WUtil.h>
-
- #include "FSViewer.h"
- #include "FSUtils.h"
---- FSViewer.app-0.2.3/src/FSFileBrowser.c~ Sat Oct 9 20:47:24 1999
-+++ FSViewer.app-0.2.3/src/FSFileBrowser.c Mon Sep 17 19:33:07 2001
-@@ -1,5 +1,5 @@
- #include <WMaker.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <sys/stat.h>
- #include <unistd.h>
-
---- FSViewer.app-0.2.3/src/DnD.h~ Sat Oct 9 20:45:23 1999
-+++ FSViewer.app-0.2.3/src/DnD.h Mon Sep 17 19:36:23 2001
-@@ -1,7 +1,7 @@
- #ifndef WINGs_DND
- #define WINGs_DND
-
--#include <WINGs.h>
-+#include <WINGs/WINGs.h>
-
- void DndInitialize(WMWidget *w);
-
---- FSViewer.app-0.2.3/src/timestampWidget.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/timestampWidget.c Mon Sep 17 19:46:47 2001
-@@ -19,7 +19,7 @@
- /* Header Files **************************************************************/
-
- #include <X11/xpm.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include "timestampWidget.h"
- #include "xpm/clk.xpm"
- #include "xpm/led.xpm"
---- FSViewer.app-0.2.3/src/timestampWidget.h~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/timestampWidget.h Mon Sep 17 19:48:21 2001
-@@ -20,7 +20,7 @@
-
- /* Header Files **************************************************************/
-
--#include <WINGs.h>
-+#include <WINGs/WINGs.h>
- #include <time.h>
-
-
---- FSViewer.app-0.2.3/src/attribsInspector.c~ Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3/src/attribsInspector.c Mon Sep 17 19:51:50 2001
-@@ -1,5 +1,5 @@
- #include <time.h>
--#include <WINGsP.h>
-+#include <WINGs/WINGsP.h>
- #include <grp.h>
- #include <pwd.h>
- #include <sys/types.h>
+++ /dev/null
-diff -Nru FSViewer.app-0.2.3/configure.in FSViewer.app-0.2.3.new/configure.in
---- FSViewer.app-0.2.3/configure.in Sat Oct 9 20:45:21 1999
-+++ FSViewer.app-0.2.3.new/configure.in Mon Sep 17 18:39:05 2001
-@@ -5,10 +5,7 @@
-
- AC_PROG_MAKE_SET
-
--PACKAGE=FSViewer.app
--AC_SUBST(PACKAGE)
--VERSION=0.2.3
--AC_SUBST(VERSION)
-+AM_INIT_AUTOMAKE(FSViewer.app, 0.2.3)
-
- dnl Checks for programs.
- AC_PROG_CC
-@@ -17,11 +14,6 @@
- AC_ARG_PROGRAM
- AC_PROG_RANLIB
-
--AC_PATH_PROG(AUTOCONF, autoconf)
--AC_PATH_PROG(ACLOCAL, aclocal)
--AC_PATH_PROG(AUTOHEADER, autoheader)
--AC_PATH_PROG(AUTOMAKE, automake)
--
- dnl the prefix
- dnl ==========
- dnl
-@@ -43,9 +35,6 @@
- fi
-
- dnl Additional "default" items
--#LIBS="$LIBS -lX11"
--#CFLAGS="$CFLAGS -I/usr/local/include"
--#LDFLAGS="$LDFLAGS -L/usr/local/lib"
-
- dnl Check for get-wraster-flags
- AC_CHECK_PROG(GET_WRASTER_FLAGS, get-wraster-flags, get-wraster-flags)
-@@ -154,4 +143,4 @@
-
- AC_DEFINE_UNQUOTED(ICONDIR, "${fsviewerdir}")
-
--AC_OUTPUT(Makefile src/Makefile src/regexp/Makefile defs/Makefile)
-+AC_OUTPUT(Makefile src/Makefile defs/Makefile)
-diff -Nru FSViewer.app-0.2.3/src/Makefile.am FSViewer.app-0.2.3.new/src/Makefile.am
---- FSViewer.app-0.2.3/src/Makefile.am Sat Oct 9 20:45:22 1999
-+++ FSViewer.app-0.2.3.new/src/Makefile.am Mon Sep 17 18:38:49 2001
-@@ -1,10 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- ##
--SUBDIRS = regexp
--bindir = @fsviewerdir@
-+bindir = $(fsviewerdir)
- bin_PROGRAMS = FSViewer
--datadir = @fsviewerdir@
--pkgdatadir = @fsviewerdir@
-+datadir = $(fsviewerdir)
-+pkgdatadir = $(fsviewerdir)
- FSViewer_SOURCES = FSViewer.c files.c FSFileBrowser.c\
- list.c misc.c prop.c timestampWidget.c \
- attribsInspector.c editInspector.c exeInspector.c \
-@@ -13,11 +12,15 @@
- FSFileView.c FSInspector.c magic.c DnD.c \
- FSPathView.c xmodifier.c FSFinder.c FSFileButton.c\
- FSMCList.c FSPrefs.c
--LDADD = -Lregexp -lregx
- noinst_HEADERS = FSViewer.h filebrowser.h files.h list.h misc.h \
- timestampWidget.h FSBrowser.h FSPanel.h FSUtils.h \
- FSMenu.h FSFileView.h magic.h DnD.h FSFileButton.h \
- FSFinder.h FSMCList.h FSPathView.h FSPrefs.h
- pkgdata_DATA = MagicFiles
--##EXTRA_DIST = icons/* xpm/* fsviewer.sh
--EXTRA_DIST = xpm/* MagicFiles
-+EXTRA_DIST = MagicFiles arrow.xpm backing2.xpm backing.xpm \
-+ clk.xpm date.xpm file_plain.xpm FSViewer.xpm \
-+ led.xpm list_dir.xpm list_dir.xpm.bak \
-+ list_exe.xpm list_file.xpm month.xpm transparent.xpm \
-+ weekday.xpm wmanalog.xpm wmdigital.xpm wmtime.xpm \
-+ year.xpm
-+
-diff -Nru FSViewer.app-0.2.3/src/regexp/Makefile.am FSViewer.app-0.2.3.new/src/regexp/Makefile.am
---- FSViewer.app-0.2.3/src/regexp/Makefile.am Sat Oct 9 20:45:23 1999
-+++ FSViewer.app-0.2.3.new/src/regexp/Makefile.am Thu Jan 1 01:00:00 1970
-@@ -1,5 +0,0 @@
--## Process this file with automake to produce Makefile.in
--##
--libregx_a_SOURCES = regerror.c regexp.c regsub.c regexp.h regmagic.h
--noinst_LIBRARIES = libregx.a
--EXTRA_DIST = README regexp.3
-diff -Nru FSViewer.app-0.2.3/xpm/Makefile.am FSViewer.app-0.2.3.new/xpm/Makefile.am
---- FSViewer.app-0.2.3/xpm/Makefile.am Fri Apr 16 19:34:30 1999
-+++ FSViewer.app-0.2.3.new/xpm/Makefile.am Mon Sep 17 18:38:28 2001
-@@ -1,4 +1,36 @@
- icondatadir = $(pkgdatadir)/icons
-
--icondata_DATA = *.xpm *.tif
-+icondata_DATA = arrow.xpm file-dot-c.xpm file-dot-mov.xpm \
-+ file-dot-sh.xpm file-generic-gnustep.xpm \
-+ generic-library.xpm clk.xpm file-dot-dat.xpm \
-+ file-dot-mp3.xpm file-dot-so.xpm file-link.xpm \
-+ generic-sound.xpm date.xpm file-dot-deb.xpm \
-+ file-dot-mpg.xpm file-dot-tar.xpm \
-+ file-makefile.xpm generic-text.xpm \
-+ exec-link.xpm file-dot-eps.xpm file-dot-m.xpm \
-+ file-dot-tcl.xpm file_plain.xpm home.xpm \
-+ file-core.xpm file-dot-f90.xpm file-dot-o.xpm \
-+ file-dot-texi.xpm file-plain.xpm led.xpm \
-+ file-dot-aiff.xpm file-dot-fig.xpm \
-+ file-dot-pdf.xpm file-dot-tex.xpm \
-+ file-readme.xpm month.xpm file-dot-au.xpm \
-+ file-dot-for.xpm file-dot-pedro.xpm \
-+ file-dot-tga.xpm folder-link.xpm mycomputer.xpm \
-+ file-dot-avi.xpm file-dot-gif.xpm \
-+ file-dot-pl.xpm file-dot-txt.xpm folder.xpm \
-+ neighbour.xpm file-dot-a.xpm file-dot-gz.xpm \
-+ file-dot-png.xpm file-dot-wav.xpm Folder.xpm \
-+ penguin.xpm file-dot-bz2.xpm file-dot-html.xpm \
-+ file-dot-ps.xpm file-dot-xbm.xpm FSViewer2.xpm \
-+ weekday.xpm file-dot-cc.xpm file-dot-h.xpm \
-+ file-dot-py.xpm file-dot-xcf.xpm FSViewer.xpm \
-+ wmanalog.xpm file-dot-class.xpm \
-+ file-dot-jar.xpm file-dot-rc.xpm \
-+ file-dot-xpm.xpm full-folder.xpm wmdigital.xpm \
-+ file-dot-conf.xpm file-dot-java.xpm \
-+ file-dot-rpm.xpm file-dot-zip.xpm \
-+ generic-coding.xpm wmtime.xpm file-dot-cpp.xpm \
-+ file-dot-jpg.xpm file-dot-shar.xpm \
-+ file-executable.xpm generic-conf.xpm year.xpm
-+
- EXTRA_DIST = $(icondata_DATA)
+++ /dev/null
---- fsviewer-0.2.3.orig/src/FSFileView.c
-+++ fsviewer-0.2.3/src/FSFileView.c
-@@ -397,10 +397,10 @@
- if ((fView->primary))
- {
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSMiniaturizableWindowMask |
-- NSResizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMMiniaturizableWindowMask |
-+ WMResizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- GSExtraFlagsAttr);
---- fsviewer-0.2.3.orig/src/FSFinder.c
-+++ fsviewer-0.2.3/src/FSFinder.c
-@@ -138,11 +138,11 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSMiniaturizableWindowMask |
-- NSClosableWindowMask |
-- NSResizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMMiniaturizableWindowMask |
-+ WMClosableWindowMask |
-+ WMResizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- GSExtraFlagsAttr);
---- fsviewer-0.2.3.orig/src/FSPanel.c
-+++ fsviewer-0.2.3/src/FSPanel.c
-@@ -1564,10 +1564,10 @@
- WMCloseWindow(selIcon->win);
- WMUnmapWidget(selIcon->win);
- WMDestroyWidget(selIcon->win);
-- free((void *) selIcon);
- if(selIcon->iconName)
- imgStr = wstrdup(selIcon->iconName);
-
-+ free((void *) selIcon);
- selIcon = NULL;
-
- return imgStr;
---- fsviewer-0.2.3.orig/src/FSViewer.c
-+++ fsviewer-0.2.3/src/FSViewer.c
-@@ -127,8 +127,8 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask | NSClosableWindowMask);
-- attributes.window_level = NSFloatingWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask | WMClosableWindowMask);
-+ attributes.window_level = WMFloatingWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -153,10 +153,10 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSClosableWindowMask |
-- NSMiniaturizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMClosableWindowMask |
-+ WMMiniaturizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -182,8 +182,8 @@
- // This is horrible: there must be a better way?
- XStoreName(fsViewer->dpy, window, " ");
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask);
-- attributes.window_level = NSFloatingWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask);
-+ attributes.window_level = WMFloatingWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
---- FSViewer.app-0.2.3/configure.in~ Mon Sep 17 19:33:41 2001
-+++ FSViewer.app-0.2.3/configure.in Mon Sep 17 19:35:04 2001
-@@ -82,7 +82,7 @@
- AC_CHECK_LIB(PropList, PLGetProplistWithPath,, AC_MSG_WARN(Can't find PropList library: Please install libPropList (included in WindowMaker)), , $LIBS)
+--- FSViewer.app-0.2.5/configure.ac.orig 2002-11-15 18:57:39.000000000 +0100
++++ FSViewer.app-0.2.5/configure.ac 2003-10-31 19:30:30.622700448 +0100
+@@ -94,8 +94,8 @@
+ dnl AC_CHECK_LIB(PropList, PLGetProplistWithPath,, AC_MSG_WARN(Can't find PropList library: Please install libPropList (included in WindowMaker)), , $LIBS)
dnl Needed by Sun/Solaris
-AC_CHECK_LIB(nsl, gethostbyname)
-+AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
- AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(socket, socket)
++AC_SEARCH_LIBS(gethostbyname, nsl)
++AC_SEARCH_LIBS(socket, socket)
dnl Needed by FreeBSD
+ AC_CHECK_LIB(kvm, kvm_read)
Summary: FSViewer is a NeXT FileViewer lookalike for Window Maker
-Summary(pl): FSViewer jest przegl±dark± plików dla WindowMakera
+Summary(pl): FSViewer jest przegl±dark± plików dla Window Makera
Name: FSViewer
-Version: 0.2.3
-Release: 4
+Version: 0.2.5
+Release: 1
License: GPL
Group: X11/Window Managers/Tools
-# newer (0.2.4), unofficial? versions:
-#Source0: http://www.bayernline.de/~gscholz/linux/fsviewer/%{name}.app-%{version}.tar.gz
-Source0: http://www.blackraven.cx/%{name}.app-%{version}.tar.gz
-# Source0-md5: 2e89029686126f9d519a67e0716ab5ff
-Source1: http://www.blackraven.cx/icons.tar.gz
-# Source1-md5: f07c9c1da6e87b7017ba5288a8fd5312
+Source0: http://www.bayernline.de/~gscholz/linux/fsviewer/%{name}.app-%{version}.tar.gz
+# Source0-md5: d1f849d1f955c35b18201860e485d332
Source2: %{name}.desktop
-Patch0: %{name}-ac_am15.patch
-Patch1: %{name}-WINGs.patch
-Patch2: %{name}-debian.patch
-Patch3: %{name}-no_libnsl.patch
+# for WindowMaker 0.81.0 (not released yet? so for future use)
+#Patch0: http://www.bayernline.de/~gscholz/linux/fsviewer/FSViewer.app-0.2.5-WM-0.81.0.patch.gz
+Patch1: %{name}-no_libnsl.patch
+#Patch1: %{name}-ac_am15.patch
+#Patch2: %{name}-WINGs.patch
+#Patch3: %{name}-debian.patch
URL: http://www.bayernline.de/~gscholz/linux/fsviewer/
-BuildRequires: WindowMaker-devel >= 0.62.1
+BuildRequires: WindowMaker-devel >= 0.70.0
BuildRequires: XFree86-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: libPropList-devel >= 0.9.1
+BuildRequires: gettext-devel
+# the rest is required for libwraster (but not all libs from WindowMaker-devel):
+BuildRequires: Hermes-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng >= 1.0.8
BuildRequires: libtiff-devel
BuildRequires: libungif-devel
-Requires: WindowMaker >= 0.61.0
+# the end of libwraster deps
+Requires: WindowMaker >= 0.70.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# well, WindowMaker-like, not gnustep*-like - because:
+# - it requires WindowMaker, not gnustep-*
+# - it doesn't follow gnustep-* hierarchy inside *.app
+%define gsappsdir %{_libdir}/GNUstep/Apps
%description
FSViewer is a NeXT FileViewer lookalike for Window Maker. Viewing is
the WINGs library.
%description -l pl
-FSViewer jest przegl±dark± plików dla WindowMakera wygl±daj±c± jak
+FSViewer jest przegl±dark± plików dla Window Makera wygl±daj±c± jak
NeXT FileViewer.
%prep
-%setup -q -a1 -n FSViewer.app-%{version}
-%patch0 -p1
+%setup -q -n FSViewer.app-%{version}
+#%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-rm -f missing
+%{__gettextize}
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --with-appspath=%{gsappsdir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}/GNUstep/Apps/FSViewer.app/{xpm,tiff} \
- $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install -d $RPM_BUILD_ROOT%{_applnkdir}/Utilities
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install defs/chdef $RPM_BUILD_ROOT%{_prefix}/GNUstep/Apps/FSViewer.app
-install xpm/*.xpm $RPM_BUILD_ROOT%{_prefix}/GNUstep/Apps/FSViewer.app/xpm
-install tiff/* $RPM_BUILD_ROOT%{_prefix}/GNUstep/Apps/FSViewer.app/tiff
+install defs/chdef $RPM_BUILD_ROOT%{gsappsdir}/FSViewer.app
install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
-%dir %{_prefix}/GNUstep/Apps/FSViewer.app
-%attr(755,root,root) %{_prefix}/GNUstep/Apps/FSViewer.app/FSViewer
-%attr(755,root,root) %{_prefix}/GNUstep/Apps/FSViewer.app/chdef
-%{_prefix}/GNUstep/Apps/FSViewer.app/MagicFiles
-%{_prefix}/GNUstep/Apps/FSViewer.app/xpm
-%{_prefix}/GNUstep/Apps/FSViewer.app/tiff
-
+%dir %{gsappsdir}/FSViewer.app
+%attr(755,root,root) %{gsappsdir}/FSViewer.app/FSViewer
+%attr(755,root,root) %{gsappsdir}/FSViewer.app/chdef
+%{gsappsdir}/FSViewer.app/MagicFiles
+%{gsappsdir}/FSViewer.app/xpm
+%{gsappsdir}/FSViewer.app/tiff
%{_applnkdir}/Utilities/FSViewer.desktop