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:   02-Feb-2003 09:51:47
  Branch: HEAD                             Handle: 2003020208514601

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

  Log:
    - add real %description
    - use virtual X11 package instead of physical x11 package
    - also override MV, LN and RM commands
    - replace <malloc.h> with <stdlib.h>
      (this especially fixes building under FreeBSD 5.0)
    - provide link between vcg and xvcg for the usual compatibility
    - do not install the pbm* stuff because better variants are part of the
      netpbm package and this stuff has not much to do with VCG anyways.
    - install the user manual visual.ps.gz which is usually required
      for working seriously with VCG

  Summary:
    Revision    Changes     Path
    1.2         +43 -28     openpkg-src/vcg/vcg.spec
    1.3147      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/vcg/vcg.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 vcg.spec
  --- openpkg-src/vcg/vcg.spec  31 Jan 2003 15:09:57 -0000      1.1
  +++ openpkg-src/vcg/vcg.spec  2 Feb 2003 08:51:47 -0000       1.2
  @@ -23,6 +23,7 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package information
   %define       V_major  1.30
   %define       V_vendor %{V_major}.r3.17
   %define       V_opkg   %{V_major}.3.17
  @@ -37,7 +38,7 @@
   Group:        Graphics
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20030131
  +Release:      20030202
   
   #   list of sources
   Source0:      ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/vcg.%{V_vendor}.tgz
  @@ -45,25 +46,29 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, x11, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20030103
  +BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030103, X11
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -    vcg is the most badly packaged program in the OpenPKG world.
  +    The VCG tool reads a textual and readable specification of a graph
  +    and visualizes the graph. If not all positions of nodes are fixed,
  +    the tool layouts the graph using several heuristics as reducing
  +    the number of crossings, minimizing the size of edges, centering
  +    of nodes. The specification language of the VCG tool is nearly
  +    compatible to GRL, the language of the Edge tool, but contains many
  +    extensions. The VCG tool allows folding of dynamically or statically
  +    specified regions of the graph.
   
   %prep
       %setup -q -n vcg.%{V_major}
   
   %build
  +    cp preconf/globals.h src/globals.h
  +    cp tMakefile.tpl tMakefile
       x11lib=`%{l_prefix}/etc/rc --query x11_libdir`
       x11inc=`%{l_prefix}/etc/rc --query x11_incdir`
  -
  -    # FIXME -- mlelstv
  -    # use vendor parser/lexer instead of running current
  -    # incompatible version of bison/flex
  -    cp tMakefile.tpl tMakefile
       %{l_shtool} subst \
           -e 's;BINPATHNAME;%{l_prefix}/bin;' \
           -e 's;MANPATHNAME;%{l_prefix}/man/man1;' \
  @@ -79,32 +84,42 @@
           -e 's;FLEXNAME;false %{l_flex};' \
           -e 's;BISONNAME;false %{l_bison} -y -d;' \
           -e 's;MAKENAME;%{l_make} %{l_mflags};' \
  -        -e 's;SEDNAME;%{l_sed};' \
  +        -e 's;SEDNAME;sed;' \
           -e 's;TOUCHNAME;touch;' \
  +        -e 's;MVNAME;mv;' \
  +        -e 's;LNNAME;ln -s;' \
  +        -e 's;RMNAME;rm -f;' \
           -e 's;parsegen;false parsegen-dummy;' \
           tMakefile
  -
  -    cp preconf/globals.h src/globals.h
  -
  -    %{l_make} -f tMakefile
  +    chmod u+w src/*.[ch] src/preconf/*.[ch]
  +    %{l_shtool} subst \
  +        -e 's;<malloc\.h>;<stdlib.h>;g' \
  +        src/*.[ch] src/preconf/*.[ch]
  +    %{l_make} %{l_mflags} -f tMakefile
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -
  -    %{l_shtool} mkdir -p -m 755 \
  +    %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man1
  -    for f in \
  -        demo/pbmrot90 demo/pbmshift demo/pbm2hp demo/vcgdemomaker \
  -        src/vcg ; do
  -        %{l_shtool} install -c -s -m 755 \
  -            $f $RPM_BUILD_ROOT%{l_prefix}/bin/
  -    done
  -    for f in \
  -        pbmrot90 pbmshift pbm2hp vcgdemomaker vcg ; do
  -        %{l_shtool} install -c -m 644 \
  -            man/$f.man $RPM_BUILD_ROOT%{l_prefix}/man/man1/$f.1
  -    done
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/vcg
  +    %{l_shtool} install -c -s -m 755 \
  +        src/vcg demo/vcgdemomaker \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/
  +    %{l_shtool} install -c -m 644 \
  +        man/vcg.man \
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1/vcg.1
  +    %{l_shtool} install -c -m 644 \
  +        man/vcgdemomaker.man \
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1/vcgdemomaker.1
  +    %{l_gzip} -9 doc/visual.ps
  +    %{l_shtool} install -c -m 644 \
  +        doc/visual.ps.gz \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/vcg/
  +    ln $RPM_BUILD_ROOT%{l_prefix}/bin/vcg \
  +       $RPM_BUILD_ROOT%{l_prefix}/bin/xvcg
  +    ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/vcg.1 \
  +       $RPM_BUILD_ROOT%{l_prefix}/man/man1/xvcg.1
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3146 -r1.3147 news.txt
  --- openpkg-web/news.txt      2 Feb 2003 07:56:30 -0000       1.3146
  +++ openpkg-web/news.txt      2 Feb 2003 08:51:46 -0000       1.3147
  @@ -1,3 +1,4 @@
  +02-Feb-2003: Upgraded package: P<vcg-1.30.3.17-20030202>
   02-Feb-2003: Upgraded package: P<guile-1.6.3-20030202>
   02-Feb-2003: Upgraded package: P<ncurses-5.3.20030201-20030202>
   02-Feb-2003: Upgraded package: P<libsndfile-1.0.4-20030202>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to