From e23f0fe11ce688b2535f4ec1bf53cf7148355ecd1f6e190d084f71c434aa5654 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 6 May 2015 15:14:09 +0000 Subject: [PATCH] update OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=325 --- confusing-invalid-spec-name.patch | 17 ----------------- rpmlint.spec | 1 + suse-manpages-for-rc-scripts.patch | 13 ------------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 confusing-invalid-spec-name.patch delete mode 100644 suse-manpages-for-rc-scripts.patch diff --git a/confusing-invalid-spec-name.patch b/confusing-invalid-spec-name.patch deleted file mode 100644 index c0caf16..0000000 --- a/confusing-invalid-spec-name.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Confusing message. The problem is not that the file does not end -# with ".spec", but that there is a mismatch of specname and pkg name. -Index: rpmlint-1.5/SpecCheck.py -=================================================================== ---- rpmlint-1.5.orig/SpecCheck.py -+++ rpmlint-1.5/SpecCheck.py -@@ -621,8 +621,8 @@ addDetails( - SPEC file to build a valid RPM package.''', - - 'invalid-spec-name', --'''Your spec filename must end with '.spec'. If it's not the case, rename your --file and rebuild your package.''', -+'''The spec file name (without the .spec suffix) must match the package name -+("Name:" tag). Either rename your package or the specfile.''', - - 'non-utf8-spec-file', - '''The character encoding of the spec file is not UTF-8. Convert it for diff --git a/rpmlint.spec b/rpmlint.spec index 3cc62a3..022431d 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -33,6 +33,7 @@ Source2: config Source3: config.in Source11: pie.config Source12: licenses.config +Source98: update_git.sh Source99: README.packaging.txt Source100: syntax-validator.py Url: https://sourceforge.net/projects/rpmlint/ diff --git a/suse-manpages-for-rc-scripts.patch b/suse-manpages-for-rc-scripts.patch deleted file mode 100644 index 0b29e09..0000000 --- a/suse-manpages-for-rc-scripts.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rpmlint-1.5/FilesCheck.py -=================================================================== ---- rpmlint-1.5.orig/FilesCheck.py -+++ rpmlint-1.5/FilesCheck.py -@@ -1404,7 +1404,7 @@ class FilesCheck(AbstractCheck.AbstractC - for exe, paths in bindir_exes.items(): - if len(paths) > 1: - printWarning(pkg, "duplicate-executable", exe, paths) -- if exe not in man_basenames: -+ if exe not in man_basenames and not exe.startswith("rc") and len(paths) is not 0: - printWarning(pkg, "no-manual-page-for-binary", exe) - - # Create an object to enable the auto registration of the test