diff --git a/rpmlint.changes b/rpmlint.changes index 04d1b80..317a430 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 19:37:57 UTC 2018 - dmueller@suse.com + +- drop obsolete suse-no-run-ldconfig.diff + ------------------------------------------------------------------- Thu Jul 5 16:48:30 UTC 2018 - matthias.gerstner@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index d1cd6ea..b516da7 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -55,7 +55,6 @@ Patch32: buildroot-in-scripts.diff Patch33: libtool-wrapper-check.diff Patch34: suse-check-optional-dependencies.diff Patch35: noarch-lib64.diff -Patch36: suse-no-run-ldconfig.diff Patch37: description-check.diff Patch38: 0001-Tighten-wrong-script-interpreter-check-to-lower-fals.patch Patch39: selfconflicts-provide.diff diff --git a/suse-no-run-ldconfig.diff b/suse-no-run-ldconfig.diff deleted file mode 100644 index ba29a36..0000000 --- a/suse-no-run-ldconfig.diff +++ /dev/null @@ -1,39 +0,0 @@ -From: Some One -Date: Thu, 9 Apr 2015 14:55:39 +0200 -Subject: [PATCH] suse-no-run-ldconfig.diff - -=================================================================== ---- - SpecCheck.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -Index: rpmlint-rpmlint-1.10/SpecCheck.py -=================================================================== ---- rpmlint-rpmlint-1.10.orig/SpecCheck.py -+++ rpmlint-rpmlint-1.10/SpecCheck.py -@@ -454,6 +454,10 @@ class SpecCheck(AbstractCheck.AbstractCh - 'comparison-operator-in-deptoken', - conf) - -+ if current_section in ('post', 'postun'): -+ if line.find('%run_ldconfig') != -1: -+ printWarning(pkg, 'deprecated-use-of-%run_ldconfig') -+ - if current_section == 'changelog': - for match in AbstractCheck.macro_regex.findall(line): - res = re.match('%+', match) -@@ -771,6 +775,14 @@ may break short circuit builds.''', - '''Make check or other automated regression test should be run in %check, as - they can be disabled with a rpm macro for short circuiting purposes.''', - -+'deprecated-use-of-%run_ldconfig', -+'''According to the new SUSE Packaging Conventions, the use of %run_ldconfig -+is deprecated. Please use /sbin/ldconfig instead, or -+ -+%post(un) -p /sbin/ldconfig -+ -+in the case where ldconfig is the only command to be executed.''', -+ - 'macro-in-%changelog', - '''Macros are expanded in %changelog too, which can in unfortunate cases lead - to the package not building at all, or other subtle unexpected conditions that