RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 06-Jan-2009 20:40:24 Branch: HEAD Handle: 2009010619402300 Modified files: rpm macros.in Log: - jbj: stub in tag data validation patterns. Summary: Revision Changes Path 1.268 +11 -2 rpm/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/macros.in ============================================================================ $ cvs diff -u -r1.267 -r1.268 macros.in --- rpm/macros.in 1 Jan 2009 18:43:04 -0000 1.267 +++ rpm/macros.in 6 Jan 2009 19:40:23 -0000 1.268 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.267 2009/01/01 18:43:04 jbj Exp $ +# $Id: macros.in,v 1.268 2009/01/06 19:40:23 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -1051,12 +1051,21 @@ # STEP 2: Assemble <E,V,R,D> tuple from regex parts # <E,V,R,D> case 1: case 2: case 3: case 4: case 5: case 6: # X:X-X:X X:X-X X:X X: X-X X -# %evr_tuple_select 1234 123_ 12__ 1___ _12_ __2_ +# %evr_tuple_select 1234 123_ 12__ 1___ _23_ _2__ %evr_tuple_select 123_ # STEP 3: Configure the comparison order of the <E,V,R,D> tuple elements %evr_tuple_order EVR +# data validation patterns for identifier tags +%pattern_Name [A-Za-z0-9]+[A-Za-z0-9+._-]* +#%pattern_Epoch [0-9]+ +#%pattern_Version [A-Za-z0-9+._]+ +#%pattern_Release [A-Za-z0-9+._]+ +#%pattern_Disttag [A-Za-z0-9]+ +#%pattern_Repotag [A-Za-z0-9]+ +#%pattern_Distepoch [A-Za-z0-9.]+ + #============================================================================== # ---- Run-time probe dependency macros. @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org