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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   01-Aug-2006 09:40:22
  Branch: OPENPKG_2_STABLE                 Handle: 2006080108402200

  Modified files:           (Branch: OPENPKG_2_STABLE)
    openpkg-src/mutt        mutt.spec

  Log:
    add another fix from CURRENT which was forgotten to be MFC'ed to
    2-STABLE

  Summary:
    Revision    Changes     Path
    1.71.2.3    +10 -1      openpkg-src/mutt/mutt.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mutt/mutt.spec
  ============================================================================
  $ cvs diff -u -r1.71.2.2 -r1.71.2.3 mutt.spec
  --- openpkg-src/mutt/mutt.spec        15 Jul 2006 16:24:21 -0000      1.71.2.2
  +++ openpkg-src/mutt/mutt.spec        1 Aug 2006 07:40:22 -0000       1.71.2.3
  @@ -38,7 +38,7 @@
   Group:        Mail
   License:      BSD
   Version:      %{V_mutt}i
  -Release:      2.20060715
  +Release:      2.20060801
   
   #   build options
   %option       with_comp      no
  @@ -129,6 +129,15 @@
               -e '/^diff.*configure\.in /,/^diff/d' \
               -e '/^diff.*acconfig\.h /,/^diff/d' |\
           %{l_patch} -p1
  +    #   add target without requiring autoconf(1) to rebuild Makefile.in
  +    #   from Makefile.am since definitions of the patch are wrongly
  +    #   placed at the very beginning of Makefile.in and get overwritten
  +    #   latter.
  +    %{l_shtool} subst -s \
  +        -e 's;^\(    \| \{8,\}\)\(crypt.c cryptglue.c .*\)$; compress.c \2;' 
\
  +        -e 's;^\(    attach.h buffy.h charset.h \)\(copy.h 
.*\)$;\1compress.h \2;' \
  +        -e 's;^\(    buffy.$(OBJEXT) color.$(OBJEXT) 
\)\(.*\)$;\1compress.$(OBJEXT) \2;' \
  +        Makefile.in
   %endif
   %if "%{with_nntp}" == "yes"
       %{l_gzip} -d -c <%{PATCH1} |\
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to