[Adonthell-commits] CVS: wastesedge INSTALL,1.4,1.5 Makefile.am,1.11,1.12 README,1.5,1.6 configure.in,1.13,1.14 wastesedge.spec.in,1.1,1.2

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge
In directory subversions:/tmp/cvs-serv17402

Modified Files:
        INSTALL Makefile.am README configure.in wastesedge.spec.in 
Log Message:
UPDATED docs for wastesedge 0.3.3
ADDED check for adonthell version to configure


Index: INSTALL
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** INSTALL     5 Feb 2002 15:09:17 -0000       1.4
--- INSTALL     17 Sep 2002 16:57:26 -0000      1.5
***************
*** 2,11 ****
  =============
  To install the Waste's Edge data package you need to have the adonthell 
! game engine version 0.3 installed. The configure script will check this 
! for you, but you can check can check whether you're ok or not by typing:
  
  $> adonthell -v
  
! This should print '0.3' and exit.
  
  
--- 2,11 ----
  =============
  To install the Waste's Edge data package you need to have the adonthell 
! game engine version 0.3.3 installed. The configure script will check this 
! for you, but you can check whether you're ok or not by typing:
  
  $> adonthell -v
  
! This should print '0.3.3' and exit.
  
  
***************
*** 16,20 ****
  ------------
  
! In the toplevel wastesedge-0.3 directory type
  
  $> ./configure
--- 16,20 ----
  ------------
  
! In the toplevel wastesedge-0.3.3 directory type
  
  $> ./configure
***************
*** 27,37 ****
  For more information, see the README file.
  
  Debian users:
  -------------
  
  You can automatically get an installable Debian package by typing
! 'debuild', which comes in the 'devscripts' package. You'll of course
! need a properly installed 'adonthell' package, which you can get from
! Adonthell's sources.
  
  You can then check whether the game is correctly installed by invoking
--- 27,41 ----
  For more information, see the README file.
  
+ 
  Debian users:
  -------------
  
  You can automatically get an installable Debian package by typing
! 
! $> debuild 
! 
! within the wastesedge-0.3.3 directory. 'debbuild' is part of the
! 'devscripts' package. You'll need a properly installed 'adonthell' 
! package of course, which you can get from Adonthell's sources.
  
  You can then check whether the game is correctly installed by invoking
***************
*** 40,43 ****
--- 44,58 ----
  Then, typing 'adonthell wastesedge' or simply 'adonthell-wastesedge' will
  get you into the game.
+ 
+ 
+ RPM users:
+ ----------
+ 
+ To create an installable RPM package, type
+ 
+ $> rpm -tb wastesedge-0.3.3.tar.gz
+ 
+ Note that the 4.x versions of rpm are currently unsupported. Feel free
+ to change that, if you want.
  
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Makefile.am 22 Aug 2002 16:18:13 -0000      1.11
--- Makefile.am 17 Sep 2002 16:57:26 -0000      1.12
***************
*** 6,11 ****
  
  EXTRA_DIST = config.rpath  $(pkgdata_DATA) PLAYING autogen.sh ABOUT-NLS \
!       debian/README.debian debian/adonthell-wastesedge.6 debian/changelog 
debian/control \
!       debian/copyright debian/dirs debian/rules debian/menu wastesedge.spec.in
  
  bin_SCRIPTS = adonthell-wastesedge
--- 6,12 ----
  
  EXTRA_DIST = config.rpath  $(pkgdata_DATA) PLAYING autogen.sh ABOUT-NLS \
!       debian/README.debian debian/adonthell-wastesedge.6 debian/changelog \
!         debian/control debian/copyright debian/dirs debian/rules debian/menu \
!         wastesedge.spec.in wastesedge.spec
  
  bin_SCRIPTS = adonthell-wastesedge

Index: README
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** README      24 Jan 2002 21:28:09 -0000      1.5
--- README      17 Sep 2002 16:57:26 -0000      1.6
***************
*** 21,25 ****
  
  Note that this package is designed to run along with the adonthell
! game engine version 0.3. Therefore, you need it installed or you'll
  be stuck at configure time. If you don't have it, download it from
  http://adonthell.linuxgames.com/download/.
--- 21,25 ----
  
  Note that this package is designed to run along with the adonthell
! game engine version 0.3.3. Therefore, you need it installed or you'll
  be stuck at configure time. If you don't have it, download it from
  http://adonthell.linuxgames.com/download/.

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** configure.in        6 Sep 2002 18:32:19 -0000       1.13
--- configure.in        17 Sep 2002 16:57:26 -0000      1.14
***************
*** 38,46 ****
     AC_PATH_PROG(adonthell_binary, adonthell)
     if test x$adonthell_binary = x ; then
!        echo "Waste's Edge requires the Adonthell game engine. Exiting ..."
         exit 1
     fi
! else 
     echo "Using $adonthell_binary as the Adonthell binary"
  fi
  
--- 38,55 ----
     AC_PATH_PROG(adonthell_binary, adonthell)
     if test x$adonthell_binary = x ; then
!        echo "*** Waste's Edge requires the Adonthell game engine. Exiting ..."
         exit 1
     fi
! else
     echo "Using $adonthell_binary as the Adonthell binary"
+ fi
+ 
+ dnl Checking for the proper version
+ AC_MSG_CHECKING(for Adonthell's version)
+ adonthellver=`$adonthell_binary -v`
+ AC_MSG_RESULT($adonthellver)
+ if test x$adonthellver != x0.3.3 ; then
+    echo "*** This version of Waste's Edge requires Adonthell v0.3.3!"
+    exit 1
  fi
  

Index: wastesedge.spec.in
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/wastesedge.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** wastesedge.spec.in  8 Feb 2002 18:15:06 -0000       1.1
--- wastesedge.spec.in  17 Sep 2002 16:57:26 -0000      1.2
***************
*** 4,11 ****
  %define ver         @VERSION@
  %define rel         1
! %define prefix      @prefix@
  %define name        @PACKAGE@
! %define bindir      @prefix@/bin
! %define datadir     @prefix@/share
  %define gamedatadir @gamedatadir@
  
--- 4,11 ----
  %define ver         @VERSION@
  %define rel         1
! %define prefix      /usr
  %define name        @PACKAGE@
! %define bindir      %prefix/bin
! %define datadir     %prefix/share
  %define gamedatadir @gamedatadir@
  
***************
*** 18,22 ****
  Source: http://freesoftware.fsf.org/download/adonthell/%{name}-%{ver}.tar.gz
  URL: http://adonthell.linuxgames.com
! BuildRoot: /tmp/adonthell
  Requires: adonthell >= %ver
  Prefix: %prefix
--- 18,22 ----
  Source: http://freesoftware.fsf.org/download/adonthell/%{name}-%{ver}.tar.gz
  URL: http://adonthell.linuxgames.com
! BuildRoot: /tmp/wastesedge
  Requires: adonthell >= %ver
  Prefix: %prefix