diff --git a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2
index 0f933f7ef..53f852d5e 100644
--- a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2
+++ b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2
@@ -32,7 +32,7 @@ Angular-Gettext javascript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2
index 6918b0381..9174173cb 100644
--- a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2
+++ b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2
@@ -32,7 +32,7 @@ Angular-UUID JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2
index 25f46e437..8ccf9f1f8 100644
--- a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2
+++ b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2
@@ -32,7 +32,7 @@ lrDragNDrop javascript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Angular/XStatic-Angular.spec.j2 b/openstack/XStatic-Angular/XStatic-Angular.spec.j2
index 23b3d0b34..9faeb966b 100644
--- a/openstack/XStatic-Angular/XStatic-Angular.spec.j2
+++ b/openstack/XStatic-Angular/XStatic-Angular.spec.j2
@@ -33,7 +33,7 @@ Angular JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Angular-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Angular-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Angular-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Angular-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2
index 238fb6ffa..71bcc33e0 100644
--- a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2
+++ b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2
@@ -32,7 +32,7 @@ Bootstrap-Datepicker javascript library packaged for setuptools (easy_install) /
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?.egg-info
-%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.*.egg-info
+%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2
index fe6f629af..a491e6d0a 100644
--- a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2
+++ b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2
@@ -32,7 +32,7 @@ Bootstrap style library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-D3/XStatic-D3.spec.j2 b/openstack/XStatic-D3/XStatic-D3.spec.j2
index 20254e3aa..a3d8fddfc 100644
--- a/openstack/XStatic-D3/XStatic-D3.spec.j2
+++ b/openstack/XStatic-D3/XStatic-D3.spec.j2
@@ -32,7 +32,7 @@ D3 javascript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_D3-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_D3-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_D3-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_D3-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2
index 6f4221694..5d5bf2980 100644
--- a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2
+++ b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2
@@ -29,7 +29,7 @@ BuildArch:      noarch
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2
index 60348fa1a..6be69601c 100644
--- a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2
+++ b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2
@@ -32,7 +32,7 @@ Font Awesome icons packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2
index 04bdac3f5..143bfa342 100644
--- a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2
+++ b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2
@@ -32,7 +32,7 @@ Hogan JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Hogan-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Hogan-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Hogan-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Hogan-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2
index 59a4bd48e..0d684d1ac 100644
--- a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2
+++ b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2
@@ -32,7 +32,7 @@ JQuery-Migrate JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2 b/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2
index 1786952d8..72b1f7da5 100644
--- a/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2
+++ b/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2
@@ -33,7 +33,7 @@ JQuery.Bootstrap.Wizard JavaScript library packaged for setuptools (easy_install
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?.egg-info
-%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.*.egg-info
+%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2
index 22cf5eafe..525841a92 100644
--- a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2
+++ b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2
@@ -32,7 +32,7 @@ JQuery.TableSorter JavaScript library packaged for setuptools (easy_install) / p
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2
index becdf97ad..146caedb2 100644
--- a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2
+++ b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2
@@ -33,7 +33,7 @@ JQuery.quicksearch JavaScript library packaged for setuptools (easy_install)
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2
index 88e83bae1..aa0ab4e99 100644
--- a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2
+++ b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2
@@ -29,7 +29,7 @@ BuildArch:      noarch
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2
index 463696b03..5a64068ec 100644
--- a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2
+++ b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2
@@ -32,7 +32,7 @@ JSEncrypt JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2
index fb6b87862..0fea1ea99 100644
--- a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2
+++ b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2
@@ -32,7 +32,7 @@ Jasmine JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2
index 39ff00d71..bcdaa4628 100644
--- a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2
+++ b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2
@@ -29,7 +29,7 @@ BuildArch:      noarch
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2 b/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2
index fd37516cb..5d160b506 100644
--- a/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2
+++ b/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2
@@ -34,7 +34,7 @@ find . -name *~ -exec rm -rf {} \;
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2
index fdcce901f..d1682074c 100644
--- a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2
+++ b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2
@@ -33,7 +33,7 @@ Rickshaw JavaScript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_Rickshaw-*-py?.?.egg-info
-%{python3_sitelib}/XStatic_Rickshaw-*-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_Rickshaw-*-py?.*.egg-info
+%{python3_sitelib}/XStatic_Rickshaw-*-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 b/openstack/XStatic-mdi/XStatic-mdi.spec.j2
index 5298cf31d..eafea7a4d 100644
--- a/openstack/XStatic-mdi/XStatic-mdi.spec.j2
+++ b/openstack/XStatic-mdi/XStatic-mdi.spec.j2
@@ -32,7 +32,7 @@ mdi javascript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_mdi-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_mdi-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_mdi-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_mdi-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
index 5b4e959e2..f462bff8e 100644
--- a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
+++ b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
@@ -33,7 +33,7 @@ smart-table javascript library packaged for setuptools (easy_install) / pip.
 %files
 %doc README.txt
 %{python3_sitelib}/xstatic
-%{python3_sitelib}/XStatic_smart_table-%{version}-py?.?.egg-info
-%{python3_sitelib}/XStatic_smart_table-%{version}-py?.?-nspkg.pth
+%{python3_sitelib}/XStatic_smart_table-%{version}-py?.*.egg-info
+%{python3_sitelib}/XStatic_smart_table-%{version}-py?.*-nspkg.pth
 
 %changelog
diff --git a/openstack/futurist/futurist.spec.j2 b/openstack/futurist/futurist.spec.j2
index 19c335453..7cdccaae0 100644
--- a/openstack/futurist/futurist.spec.j2
+++ b/openstack/futurist/futurist.spec.j2
@@ -59,6 +59,6 @@ python3 -m stestr.cli run
 %doc doc/build/html README.rst
 %license LICENSE
 %{python3_sitelib}/futurist
-%{python3_sitelib}/futurist-*-py?.?.egg-info
+%{python3_sitelib}/futurist-*-py?.*.egg-info
 
 %changelog
diff --git a/openstack/openstackdocstheme/openstackdocstheme.spec.j2 b/openstack/openstackdocstheme/openstackdocstheme.spec.j2
index a802c0820..7aebedf63 100644
--- a/openstack/openstackdocstheme/openstackdocstheme.spec.j2
+++ b/openstack/openstackdocstheme/openstackdocstheme.spec.j2
@@ -56,6 +56,6 @@ python3 setup.py test
 %exclude %{_sysconfdir}/alternatives/*.pyc
 %exclude %{_sysconfdir}/alternatives/*.pyo
 %{python3_sitelib}/{{ pypi_name }}
-%{python3_sitelib}/{{ pypi_name }}-*-py?.?.egg-info
+%{python3_sitelib}/{{ pypi_name }}-*-py?.*.egg-info
 
 %changelog
diff --git a/openstack/oslo.privsep/oslo.privsep.spec.j2 b/openstack/oslo.privsep/oslo.privsep.spec.j2
index 055a54faa..36d12e4db 100644
--- a/openstack/oslo.privsep/oslo.privsep.spec.j2
+++ b/openstack/oslo.privsep/oslo.privsep.spec.j2
@@ -78,7 +78,7 @@ python3  -m stestr.cli run
 %license LICENSE
 %{_bindir}/privsep-helper
 %{python3_sitelib}/oslo_privsep
-%{python3_sitelib}/{{ pypi_name }}-*-py?.?.egg-info
+%{python3_sitelib}/{{ pypi_name }}-*-py?.*.egg-info
 
 %files -n {{ py2name() }}-doc
 %doc doc/build/html
diff --git a/openstack/pbr/pbr.spec.j2 b/openstack/pbr/pbr.spec.j2
index 4e813986e..ce3724452 100644
--- a/openstack/pbr/pbr.spec.j2
+++ b/openstack/pbr/pbr.spec.j2
@@ -70,7 +70,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/{{ pypi_name }}
-%{python3_sitelib}/{{ pypi_name }}-*-py?.?.egg-info
+%{python3_sitelib}/{{ pypi_name }}-*-py?.*.egg-info
 
 %files -n python-pbr-doc
 %license LICENSE
diff --git a/openstack/pycadf/pycadf.spec.j2 b/openstack/pycadf/pycadf.spec.j2
index 51af98703..3ea3ce31b 100644
--- a/openstack/pycadf/pycadf.spec.j2
+++ b/openstack/pycadf/pycadf.spec.j2
@@ -78,7 +78,7 @@ python3 -m stestr.cli run
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/{{ pypi_name }}
-%{python3_sitelib}/{{ pypi_name }}-*-py?.?.egg-info
+%{python3_sitelib}/{{ pypi_name }}-*-py?.*.egg-info
 
 %files -n python-pycadf-common
 %license LICENSE
diff --git a/openstack/python-barbicanclient/python-barbicanclient.spec.j2 b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
index aada7bc31..3705bedf5 100644
--- a/openstack/python-barbicanclient/python-barbicanclient.spec.j2
+++ b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
@@ -91,7 +91,7 @@ python3 -m stestr.cli run \
 
 %files -n python3-barbicanclient
 %license LICENSE
-%{python3_sitelib}/python_barbicanclient-%{version}-py?.?.egg-info
+%{python3_sitelib}/python_barbicanclient-%{version}-py?.*.egg-info
 %{python3_sitelib}/barbicanclient
 %{_bindir}/barbican
 
diff --git a/openstack/python-zaqarclient/python-zaqarclient.spec.j2 b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
index aa40b6522..d5c47a3c2 100644
--- a/openstack/python-zaqarclient/python-zaqarclient.spec.j2
+++ b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
@@ -88,7 +88,7 @@ PYTHONPATH=. nosetests-3
 %doc README.rst ChangeLog examples
 %license LICENSE
 %{python3_sitelib}/zaqarclient
-%{python3_sitelib}/python_zaqarclient-*-py?.?.egg-info
+%{python3_sitelib}/python_zaqarclient-*-py?.*.egg-info
 
 %files -n {{ py2name() }}-doc
 %doc doc/build/html