OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   23-Oct-2003 21:57:49
  Branch: HEAD                             Handle: 2003102320574702

  Modified files:
    openpkg-src/xplanet     xplanet.spec
    openpkg-web             news.txt

  Log:
    Fix TIFF support and provide earth.jpg map file.
    
    Hints by: Matthias Kurz

  Summary:
    Revision    Changes     Path
    1.13        +10 -9      openpkg-src/xplanet/xplanet.spec
    1.7133      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/xplanet/xplanet.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 xplanet.spec
  --- openpkg-src/xplanet/xplanet.spec  15 Jul 2003 16:11:54 -0000      1.12
  +++ openpkg-src/xplanet/xplanet.spec  23 Oct 2003 19:57:49 -0000      1.13
  @@ -33,18 +33,19 @@
   Group:        XWindow
   License:      GPL
   Version:      0.94
  -Release:      20030715
  +Release:      20031023
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/xplanet/xplanet-nomap-%{version}.tar.gz
  +Source1:      http://www.zewall.com/globe/earthmap2k.jpg
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, gcc
   PreReq:       OpenPKG, openpkg >= 20030708, X11
  -BuildPreReq:  freetype, jpeg, png, tiff
  -PreReq:       freetype, jpeg, png, tiff
  +BuildPreReq:  freetype, jpeg, png, tiff, zlib
  +PreReq:       freetype, jpeg, png, tiff, zlib
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -54,17 +55,14 @@
       rectangular projections can be shown. The other planets and some
       satellites may also be displayed.
   
  -    One can retrieve suitable maps e.g. at ...
  -    o http://www.radcyberzine.com/xglobe/
  -    o http://www.vterrain.org/Imagery/whole_earth.html
  -    o http://gw.marketingden.com/planets/planets.html
  -    Take a look at the xplanet home page for more details.
  -
   %prep
       %setup -q
       %{l_shtool} subst \
           -e 's;ctime(\(&current_time.tv_sec\));ctime((time_t *) \1);' \
           xplanetbg.cc
  +    %{l_shtool} subst \
  +        -e 's;-ltiff -lm;-ltiff -ljpeg -lz -lm;' \
  +        configure
   
   %build
       CC="%{l_cc}" \
  @@ -97,6 +95,9 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags}  install prefix=$RPM_BUILD_ROOT%{l_prefix}
  +    %{l_shtool} install -c -m 644 \
  +        %{SOURCE earthmap2k.jpg} \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/xplanet/images/earth.jpg
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/tkxplanet
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/tzcoord.pl
       rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/tkxplanet.1
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7132 -r1.7133 news.txt
  --- openpkg-web/news.txt      23 Oct 2003 19:35:26 -0000      1.7132
  +++ openpkg-web/news.txt      23 Oct 2003 19:57:47 -0000      1.7133
  @@ -1,3 +1,4 @@
  +23-Oct-2003: Upgraded package: P<xplanet-0.94-20031023>
   23-Oct-2003: Upgraded package: P<blender-2.28c-20031023>
   23-Oct-2003: Upgraded package: P<xterm-1.80-20031023>
   23-Oct-2003: Upgraded package: P<bsdiff-4.1-20031023>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to