RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: popt                             Date:   11-Feb-2008 18:16:22
  Branch: HEAD                             Handle: 2008021117162101

  Modified files:
    popt                    CHANGES popthelp.c

  Log:
    - jbj: POPT_AUTOALIAS: if no popt aliases/execs, don't display the
    sub-head.

  Summary:
    Revision    Changes     Path
    1.36        +1  -0      popt/CHANGES
    1.70        +3  -0      popt/popthelp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/CHANGES
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 CHANGES
  --- popt/CHANGES	11 Feb 2008 17:06:25 -0000	1.35
  +++ popt/CHANGES	11 Feb 2008 17:16:21 -0000	1.36
  @@ -1,4 +1,5 @@
   1.13 -> 1.14:
  +    - jbj: POPT_AUTOALIAS: if no popt aliases/execs, don't display the sub-head.
       - jbj: add --libdir=/%{_lib} to popt.spec.
       - jbj: add .cvsignore to m4 subdirectory.
       - jbj: remove duplicate nb locale from ALL_LINGUAS.
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/popthelp.c
  ============================================================================
  $ cvs diff -u -r1.69 -r1.70 popthelp.c
  --- popt/popthelp.c	4 Nov 2007 15:57:20 -0000	1.69
  +++ popt/popthelp.c	11 Feb 2008 17:16:22 -0000	1.70
  @@ -576,6 +576,9 @@
   	if (sub_transdom == NULL)
   	    sub_transdom = translation_domain;
   	    
  +	/* If no popt aliases/execs, skip poptAliasOption processing. */
  +	if (opt->arg == poptAliasOptions && !(con->numAliases || con->numExecs))
  +	    continue;
   	if (opt->descrip)
   	    xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
   
  @@ .