From 37d3052c53f3e957fb72bbbc1f1b4d8fc0e853889c116cfece5993cfa7008c8a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 27 Feb 2018 09:59:23 +0000 Subject: [PATCH] - merge content of new rpmlintrc into existing Mesa-rpmlintrc file OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=715 --- Mesa-drivers-rpmlintrc | 9 +++++++++ Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 1 - Mesa-rpmlintrc | 9 +++++++++ Mesa.changes | 5 +++++ Mesa.spec | 1 - rpmlintrc | 9 --------- 7 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 rpmlintrc diff --git a/Mesa-drivers-rpmlintrc b/Mesa-drivers-rpmlintrc index c8e2b56..cc54813 100644 --- a/Mesa-drivers-rpmlintrc +++ b/Mesa-drivers-rpmlintrc @@ -1,2 +1,11 @@ +# This line is mandatory to access the configuration functions +from Config import * + # Want to allow for multiple vendors addFilter("shlib-policy-name-error") +addFilter("Mesa-libOpenCL.*library-without-ldconfig-postin") +addFilter("Mesa-libOpenCL.*library-without-ldconfig-postun") +addFilter("libXvMC_nouveau.*library-without-ldconfig-postin") +addFilter("libXvMC_nouveau.*library-without-ldconfig-postun") +addFilter("libXvMC_r600.*library-without-ldconfig-postin") +addFilter("libXvMC_r600.*library-without-ldconfig-postun") diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 9176c2a..89756d0 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 09:58:06 UTC 2018 - sndirsch@suse.com + +- merge content of new rpmlintrc into existing Mesa-rpmlintrc file + ------------------------------------------------------------------- Fri Feb 23 13:36:23 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index bcf2978..3474cc7 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -131,7 +131,6 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring -Source8: rpmlintrc # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch diff --git a/Mesa-rpmlintrc b/Mesa-rpmlintrc index c8e2b56..cc54813 100644 --- a/Mesa-rpmlintrc +++ b/Mesa-rpmlintrc @@ -1,2 +1,11 @@ +# This line is mandatory to access the configuration functions +from Config import * + # Want to allow for multiple vendors addFilter("shlib-policy-name-error") +addFilter("Mesa-libOpenCL.*library-without-ldconfig-postin") +addFilter("Mesa-libOpenCL.*library-without-ldconfig-postun") +addFilter("libXvMC_nouveau.*library-without-ldconfig-postin") +addFilter("libXvMC_nouveau.*library-without-ldconfig-postun") +addFilter("libXvMC_r600.*library-without-ldconfig-postin") +addFilter("libXvMC_r600.*library-without-ldconfig-postun") diff --git a/Mesa.changes b/Mesa.changes index 9176c2a..89756d0 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 09:58:06 UTC 2018 - sndirsch@suse.com + +- merge content of new rpmlintrc into existing Mesa-rpmlintrc file + ------------------------------------------------------------------- Fri Feb 23 13:36:23 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index e99a6ab..e340fc5 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -130,7 +130,6 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring -Source8: rpmlintrc # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch diff --git a/rpmlintrc b/rpmlintrc deleted file mode 100644 index 13e05b9..0000000 --- a/rpmlintrc +++ /dev/null @@ -1,9 +0,0 @@ -# This line is mandatory to access the configuration functions -from Config import * - -addFilter("Mesa-libOpenCL.*library-without-ldconfig-postin") -addFilter("Mesa-libOpenCL.*library-without-ldconfig-postun") -addFilter("libXvMC_nouveau.*library-without-ldconfig-postin") -addFilter("libXvMC_nouveau.*library-without-ldconfig-postun") -addFilter("libXvMC_r600.*library-without-ldconfig-postin") -addFilter("libXvMC_r600.*library-without-ldconfig-postun")