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:   14-Aug-2003 14:34:12
  Branch: HEAD                             Handle: 2003081413341101

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

  Log:
    - enforce disabled sound support
    - remove some .info file conflicts
    
    Submitted by: Matt Hoosier <[EMAIL PROTECTED]>
    PR: 234, 235

  Summary:
    Revision    Changes     Path
    1.16        +17 -3      openpkg-src/xemacs/xemacs.spec
    1.6168      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/xemacs/xemacs.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 xemacs.spec
  --- openpkg-src/xemacs/xemacs.spec    23 Jul 2003 13:32:30 -0000      1.15
  +++ openpkg-src/xemacs/xemacs.spec    14 Aug 2003 12:34:12 -0000      1.16
  @@ -37,7 +37,7 @@
   Group:        Editor
   License:      GPL
   Version:      %{V_xemacs}
  -Release:      20030723
  +Release:      20030814
   
   #   package options
   %option       with_gtk      yes
  @@ -71,6 +71,7 @@
       %setup -q
   
   %build
  +    #   configure package
       PACKAGE_PATH=""
       for i in xemacs mule site; do
           [ ".$PACKAGE_PATH" != . ] && PACKAGE_PATH="${PACKAGE_PATH}::"
  @@ -95,18 +96,24 @@
           --site-libraries=%{l_prefix}/lib \
           --with-site-lisp \
           --with-database=berkdb \
  +        --with-sound=none \
           --with-ncurses \
           --with-jpeg \
           --with-tiff \
           --with-png \
           --with-xpm
  +
  +    #   build package
       %{l_make} %{l_mflags}
   
   %install
  +    #   install package
       rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags} install \
           prefix=$RPM_BUILD_ROOT%{l_prefix} \
           exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
  +
  +    #   post-adjust installation
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/xemacs
       mv $RPM_BUILD_ROOT%{l_prefix}/bin/xemacs-%{version} \
          $RPM_BUILD_ROOT%{l_prefix}/bin/xemacs
  @@ -119,15 +126,22 @@
               $RPM_BUILD_ROOT/%{l_prefix}/lib/xemacs/${i}-packages
       done
   
  -%if "%{with_sumo}" == "yes"
       #   install optional sumo package cluster
  +%if "%{with_sumo}" == "yes"
       ( cd $RPM_BUILD_ROOT/%{l_prefix}/lib/xemacs
         %{l_gzip} -dc %{SOURCE xemacs-sumo-%{V_sumo}.tar.gz} | %{l_tar} -xvf -
       ) || exit $?
   %endif
   
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
  +    #   strip down installation
  +    rm -f \
  +        $RPM_BUILD_ROOT%{l_prefix}/info/dir \
  +        $RPM_BUILD_ROOT%{l_prefix}/info/info.info* \
  +        $RPM_BUILD_ROOT%{l_prefix}/info/standards.info* \
  +        $RPM_BUILD_ROOT%{l_prefix}/info/texinfo.info*
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  +
  +    #   determine installation files
       %{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.6167 -r1.6168 news.txt
  --- openpkg-web/news.txt      14 Aug 2003 11:11:56 -0000      1.6167
  +++ openpkg-web/news.txt      14 Aug 2003 12:34:11 -0000      1.6168
  @@ -1,3 +1,4 @@
  +14-Aug-2003: Upgraded package: P<xemacs-21.4.13-20030814>
   14-Aug-2003: Upgraded package: P<netpbm-10.11.11-20030814>
   14-Aug-2003: Upgraded package: P<sav-2.14-20030814>
   14-Aug-2003: Upgraded package: P<mico-2.3.10-20030814>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to