From 3a35d8e5c834bb7f338b1bed1b06f312fc14b403 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Aug 19 2020 13:55:48 +0000 Subject: [PATCH 1/2] Fix example for __provides_exclude_from The regex for this example was broken, using %{libdir} instead of %{_libdir} and splitting the ".*" string intended to match the filename. --- diff --git a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc index e7f9409..a7fbc61 100644 --- a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc +++ b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc @@ -44,7 +44,7 @@ The macros `+%__requires_exclude_from+` and `+%__provides_exclude_from+` can be # Do not check .so files in an application-specific library directory # or any files in the application's data directory for provides -%global __provides_exclude_from ^(.%{libdir}/%{name}/*\\.so|%{_datadir}/myapp/.*)$ +%global __provides_exclude_from ^(%{_libdir}/%{name}/.*\\.so|%{_datadir}/myapp/.*)$ .... Note that this macro replaces the `+%filter_provides_in+` macro from the old filtering guidelines but it does not do the same thing. In particular: From 323512d2a13ec749485ec3f09c60106b334cf01b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Aug 19 2020 13:55:48 +0000 Subject: [PATCH 2/2] Adjust example regex to match libfoo.so.1 as well --- diff --git a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc index a7fbc61..4eb0793 100644 --- a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc +++ b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc @@ -44,7 +44,7 @@ The macros `+%__requires_exclude_from+` and `+%__provides_exclude_from+` can be # Do not check .so files in an application-specific library directory # or any files in the application's data directory for provides -%global __provides_exclude_from ^(%{_libdir}/%{name}/.*\\.so|%{_datadir}/myapp/.*)$ +%global __provides_exclude_from ^(%{_libdir}/%{name}/.*\\.so.*|%{_datadir}/myapp/.*)$ .... Note that this macro replaces the `+%filter_provides_in+` macro from the old filtering guidelines but it does not do the same thing. In particular: