diff --git a/config b/config index 8539037..1a891d6 100644 --- a/config +++ b/config @@ -63,6 +63,7 @@ setOption("UseUTF8", 1) #setOption("ReleaseExtension", None) #setOption("ValidGroups", ("Group1", "Group2")) #setOption("KernelModuleRPMsOK", 0) +setOption("CompressExtension", None) setOption('StandardGroups', ( 'aegis', diff --git a/rpmlint.changes b/rpmlint.changes index 323d7ad..9c4335c 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 24 14:20:48 UTC 2011 - lnussel@suse.de + +- disable source-or-patch-not-compressed. Not useful anymore. + ------------------------------------------------------------------- Fri May 20 14:47:40 UTC 2011 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 77f8d71..9eb4210 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -65,7 +65,8 @@ Patch1: suse-checks.diff Patch2: suse-version.diff Patch3: suse-url-check.diff Patch4: invalid-filerequires.diff -Patch5: suse-bzip-bigger-than-100k.diff +# disable +#Patch5: suse-bzip-bigger-than-100k.diff Patch6: suse-filesystem.diff Patch7: suse-pkg-config-check.diff Patch8: suse-binarieschecks.diff @@ -149,7 +150,7 @@ Authors: %patch2 %patch3 %patch4 -%patch5 +#patch5 %patch6 %patch7 %patch8 diff --git a/suse-bzip-bigger-than-100k.diff b/suse-bzip-bigger-than-100k.diff deleted file mode 100644 index 6e92fe9..0000000 --- a/suse-bzip-bigger-than-100k.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: SourceCheck.py -=================================================================== ---- SourceCheck.py.orig -+++ SourceCheck.py -@@ -17,7 +17,7 @@ import Config - - DEFAULT_VALID_SRC_PERMS = (0644, 0755) - --source_regex = re.compile('\\.(tar|patch|tgz|diff)$') -+source_regex = re.compile('\\.(tar|tar\.gz|patch|tgz|diff)$') - compress_ext = Config.getOption("CompressExtension", "bz2") - valid_src_perms = Config.getOption("ValidSrcPerms", DEFAULT_VALID_SRC_PERMS) - -@@ -41,7 +41,7 @@ class SourceCheck(AbstractCheck.Abstract - else: - spec_file = fname - elif source_regex.search(fname) and compress_ext and \ -- not fname.endswith(compress_ext): -+ not fname.endswith(compress_ext) and pkgfile.size > 120*1024: - printWarning(pkg, 'source-or-patch-not-compressed', - compress_ext, fname) - perm = pkgfile.mode & 07777 -@@ -58,8 +58,10 @@ all your RPM information.''', - - 'source-or-patch-not-compressed', - '''A source archive or file in your package is not compressed using the %s --compression method (doesn't have the %s extension).''' % --(compress_ext, compress_ext), -+compression method (doesn't have the %s extension). -+Files bigger than 100k should be bzip2'ed -+in order to save space. To bzip2 a patch, use bzip2. To bzip2 a source -+tarball, use bznew''' % (compress_ext, compress_ext), - - 'strange-permission', - '''A file that you listed to include in your package has strange