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

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2...@rpm5.org
  Module: popt                             Date:   15-Apr-2011 12:52:44
  Branch: HEAD                             Handle: 2011041510524300

  Modified files:
    popt                    CHANGES Makefile.am

  Log:
    fix the configmake.h make rule: update its timestamp also if it don't
    change

  Summary:
    Revision    Changes     Path
    1.157       +1  -0      popt/CHANGES
    1.77        +4  -0      popt/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/CHANGES
  ============================================================================
  $ cvs diff -u -r1.156 -r1.157 CHANGES
  --- popt/CHANGES      14 Apr 2011 13:26:57 -0000      1.156
  +++ popt/CHANGES      15 Apr 2011 10:52:43 -0000      1.157
  @@ -1,4 +1,5 @@
   1.17 -> 2.0:
  +    - devzero2000: fix the configmake.h make rule: update its timestamp also 
if it don't change.
       - devzero2000: revert bad commit: add missing glob.h and fnmatch.h in 
configure.ac, add struct sb in poptconfig.c
       - devzero2000: Rewrite the logic in poptReadDefaultConfig 
         for finding the popt alias file
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.76 -r1.77 Makefile.am
  --- popt/Makefile.am  14 Apr 2011 12:40:49 -0000      1.76
  +++ popt/Makefile.am  15 Apr 2011 10:52:43 -0000      1.77
  @@ -58,6 +58,7 @@
        } | sed '/""/d' > $@-t && \
        if test -f $@ && cmp $@-t $@ > /dev/null; then \
          rm -f $@-t; \
  +       touch $@; \
        else \
          rm -f $@; mv $@-t $@; \
        fi
  @@ -124,6 +125,9 @@
   pkgconfigdir = $(libdir)/pkgconfig
   pkgconfig_DATA = popt.pc
   
  +poptaliasdir = $(sysconfdir)/popt.d
  +poptalias_DATA =
  +
   if HAVE_LD_VERSION_SCRIPT
   libpopt_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/libpopt.vers
   endif
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to