- builds now, but needs paths fixing

Changed files:
    SearchAndRescue.spec -> 1.6

diff --git a/SearchAndRescue.spec b/SearchAndRescue.spec
index ff4f962192831bebfb5b6a018d400a6582b787f1..90a402a82f73575e5b2a4269e0771fabbbed8089 100644 (file)
--- a/SearchAndRescue.spec
+++ b/SearchAndRescue.spec
@@ -1,18 +1,19 @@
 #
-# Conditiona build
-# --with libY - build with libY
-# --with jsw - build with lib joystick
+# TODO: fix default paths
+#
+# Conditional build:
+# --with libY  - with libY
+# --with jsw   - with lib joystick
 #
 Summary:       Search And Rescue - Linux flight simulator
 Summary(pl):   Search And Rescue - symulator lotu ¶mig³owca
 Name:          SearchAndRescue
 Version:       0.7.20
-Release:       1
+Release:       0.1
 License:       GPL
 Group:         X11/Applications/Games
-#Source0:      ftp://wolfpack.twu.net/users/wolfpack/%{name}%{version}.tar.bz2
 Source0:       ftp://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
-Patch1:                SAR-Makefile.patch
+Patch0:                %{name}-Makefile.patch
 URL:           http://wolfpack.twu.net/SearchAndRescue/
 BuildRequires: XFree86-devel >= 3.3.6
 BuildRequires: OpenGL-devel
@@ -31,21 +32,28 @@ Symulator lotu 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p0
+%patch0 -p1
 
 %build
-cd sar
-#./configure --prefix=%{_prefix}
-%{__make} -f Makefile.Linux RPM_OPT_FLAGS="%{rpmcflags}"
+%{__make} -C sar -f Makefile.Linux \
+       OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} install
+%{__make} -C sar -f Makefile.Linux install \
+       PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+       GAMES_DIR=$RPM_BUILD_ROOT%{_bindir} \
+       MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man6 \
+       SHARE_GAMES_DIR=$RPM_BUILD_ROOT%{_datadir} \
+       SHADE_ICONS_DIR=$RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc
-#%attr(,,)
+%doc AUTHORS INSTALL README docs
+%attr(755,root,root) %{_bindir}/*
+%{_datadir}/SearchAndRescue
+%{_pixmapsdir}/SearchAndRescue.xpm
+%{_mandir}/man6/*