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:   12-Mar-2003 16:48:13
  Branch: HEAD                             Handle: 2003031215480803

  Added files:
    openpkg-src/xfig        xfig.sh
  Modified files:
    openpkg-src/xfig        xfig.spec
    openpkg-web             news.txt
  Removed files:
    openpkg-src/xfig        xfig

  Log:
    final package polishing

  Summary:
    Revision    Changes     Path
    1.2         +0  -10     openpkg-src/xfig/xfig
    1.1         +6  -0      openpkg-src/xfig/xfig.sh
    1.2         +17 -14     openpkg-src/xfig/xfig.spec
    1.3663      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  rm -f openpkg-src/xfig/xfig <<'@@ .'
  Index: openpkg-src/xfig/xfig
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xfig/xfig.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 xfig.sh
  --- /dev/null 2003-03-12 16:48:11.000000000 +0100
  +++ xfig.sh   2003-03-12 16:48:12.000000000 +0100
  @@ -0,0 +1,6 @@
  +#! /bin/sh
  +PATH="@l_prefix@/bin:$PATH"
  +export PATH
  +XAPPLRESDIR="@l_prefix@/etc/X11/app-defaults"
  +export XAPPLRESDIR
  +exec @l_prefix@/libexec/xfig/xfig ${1+"@"}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xfig/xfig.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 xfig.spec
  --- openpkg-src/xfig/xfig.spec        12 Mar 2003 14:53:03 -0000      1.1
  +++ openpkg-src/xfig/xfig.spec        12 Mar 2003 15:48:11 -0000      1.2
  @@ -37,7 +37,7 @@
   
   #   list of sources
   Source0:      ftp://epb.lbl.gov/xfig/xfig.%{version}.code_only.tar.gz
  -Source1:      xfig
  +Source1:      xfig.sh
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -49,13 +49,17 @@
   
   %description
       xfig is an X Window System tool for creating basic vector graphics,
  -    including bezier curves, lines, rulers and more. The resulting graphics can
  -    be saved, printed on PostScript printers or converted to a variety of other
  -    formats (e.g., X11 bitmaps, Encapsulated PostScript, LaTeX).
  +    including bezier curves, lines, rulers and more. The resulting
  +    graphics can be saved, printed on PostScript printers or converted
  +    to a variety of other formats (e.g., X11 bitmaps, Encapsulated
  +    PostScript, LaTeX).
   
   %prep
       %setup -q -n xfig.%{version}
  -    X11BINDIR="`%{l_prefix}/etc/rc --query x11_bindir`"
  +
  +%build
  +    #   configure package
  +    X11BINDIR=`%{l_prefix}/etc/rc --query x11_bindir`
       %{l_shtool} subst \
           -e "s;^XCOMM \(BINDIR =\).*$;DESTDIR = \"$RPM_BUILD_ROOT\"\n\1 
%{l_prefix}/libexec/xfig;" \
           -e "s;^XCOMM \(MKDIRHIER =\).*$;\1 $X11BINDIR/mkdirhier;" \
  @@ -74,12 +78,12 @@
           -e 's;^\(#define I18N\)$;XCOMM \1;' \
           -e 's;^XCOMM \(USEINLINE = .*\)$;\1;' \
           Imakefile
  -    echo "DESTDIR = \"$RPM_BUILD_ROOT\"" >> Imakefile
  -
  -%build
  +    echo "DESTDIR = \"$RPM_BUILD_ROOT\"" >>Imakefile
       X11BINDIR="`%{l_prefix}/etc/rc --query x11_bindir`"
       export PATH="$PATH:$X11BINDIR"
       $X11BINDIR/xmkmf -a
  +
  +    #   build binaries
       %{l_make} %{l_mflags -O} xfig
   
   %install
  @@ -93,8 +97,8 @@
           $RPM_BUILD_ROOT%{l_prefix}/bin
       %{l_shtool} install -c -m 755 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE xfig} \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/
  +        %{SOURCE xfig.sh} \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/xfig
   
       #   strip binaries
       strip $RPM_BUILD_ROOT%{l_prefix}/libexec/xfig/* >/dev/null 2>&1 || true
  @@ -103,12 +107,11 @@
       ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/X11/app-defaults
         chmod u+rw Fig Fig-color
         %{l_shtool} install -m 644 \
  -          Fig \
  -          Fig-classic
  +          Fig Fig-classic
         %{l_shtool} install -m 644 \
             -e 's;^\(#include \)"Fig"$;\1"Fig-classic";' \
  -          Fig-color \
  -          Fig
  +          Fig-color Fig
  +      rm -f Fig-color
       )
   
       #   generate file list
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3662 -r1.3663 news.txt
  --- openpkg-web/news.txt      12 Mar 2003 15:39:23 -0000      1.3662
  +++ openpkg-web/news.txt      12 Mar 2003 15:48:08 -0000      1.3663
  @@ -1,3 +1,4 @@
  +12-Mar-2003: Upgraded package: P<xfig-3.2.4-20030312>
   12-Mar-2003: Upgraded package: P<exim-4.14-20030312>
   12-Mar-2003: Upgraded package: P<libgdome-0.7.4-20030312>
   12-Mar-2003: New package: P<xfig-3.2.4-20030312>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to