--- TagsCheck.py~	2006-09-23 12:08:23.000000000 +0300
+++ TagsCheck.py	2006-09-24 00:19:26.000000000 +0300
@@ -384,6 +384,8 @@
 basename_regex=re.compile('/?([^/]+)$')
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
 changelog_text_version_regex=re.compile('^\s*-\s*((\d+:)?[\w\.]+-[\w\.]+)')
+dist_regex=Config.getOption('DistRegex')
+if dist_regex: dist_regex=re.compile(dist_regex)
 release_ext=Config.getOption('ReleaseExtension')
 extension_regex=release_ext and re.compile(release_ext + '$')
 use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1)
@@ -598,11 +600,13 @@
                     srpm=pkg[rpm.RPMTAG_SOURCERPM]
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
-                        expected=version + '-' + release
+                        expected=[version + '-' + release]
                         if epoch is not None: # regardless of use_epoch
-                            expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
-                            printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)
+                            expected[0]=str(epoch) + ':' + expected[0]
+                        if dist_regex:
+                            expected.append(dist_regex.sub('', expected[0]))
+                        if ret.group(1) not in expected:
+                            printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected[0])
 
             if clt: changelog=changelog + clt
             if use_utf8 and not Pkg.is_utf8_str(' '.join(changelog)):