diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index c9f670f..f69205f 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index c9f670f..f69205f 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index c9f670f..f69205f 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/gcc.spec.in b/gcc.spec.in
index 6dc34e0..d1d4e10 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -614,10 +614,10 @@ tools based on the GNU GCC technology.
 Summary:      GNU Ada Runtime Libraries
 License:      GPL-3.0-with-GCC-exception
 Group:        System/Libraries
-Provides: libgnarl-5@variant@ = %{version}-%{release}
-Conflicts: %selfconflict libgnarl-5@variant@
-Provides: libgnat-5@variant@ = %{version}-%{release}
-Conflicts: %selfconflict libgnat-5@variant@
+Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release}
+Conflicts: %selfconflict libgnarl-@base_ver@@variant@
+Provides: libgnat-@base_ver@@variant@ = %{version}-%{release}
+Conflicts: %selfconflict libgnat-@base_ver@@variant@
 
 %description -n libada@base_ver@@variant@
 This package contains the shared libraries required to run programs
@@ -2398,14 +2398,14 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
 
 %files -n libada@base_ver@
 %defattr(-,root,root)
-%mainlib libgnarl-*.so
-%mainlib libgnat-*.so
+%mainlib libgnarl%{binsuffix}.so
+%mainlib libgnat%{binsuffix}.so
 
 %if %{separate_biarch}
 %files -n libada@base_ver@%{separate_biarch_suffix}
 %defattr(-,root,root)
-%biarchlib libgnarl-*.so
-%biarchlib libgnat-*.so
+%biarchlib libgnarl%{binsuffix}.so
+%biarchlib libgnat%{binsuffix}.so
 %endif
 %endif
 
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index c9f670f..f69205f 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/gcc7.changes b/gcc7.changes
index c9f670f..f69205f 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -4,6 +4,7 @@ Thu Apr 13 08:48:41 UTC 2017 - rguenther@suse.com
 - Update to gcc trunk head (r246899).
 - Always create nvptx offloading cross spec file.
 - Add gcc7-pr80321.patch to fix profiledboostrap failure.
+- Fix libada provides/conflicts.
 
 -------------------------------------------------------------------
 Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
diff --git a/gcc7.spec b/gcc7.spec
index b86995c..5c75d34 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -837,10 +837,10 @@ tools based on the GNU GCC technology.
 Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-with-GCC-exception
 Group:          System/Libraries
-Provides:       libgnarl-5 = %{version}-%{release}
-Conflicts:      %selfconflict libgnarl-5
-Provides:       libgnat-5 = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-5
+Provides:       libgnarl-7 = %{version}-%{release}
+Conflicts:      %selfconflict libgnarl-7
+Provides:       libgnat-7 = %{version}-%{release}
+Conflicts:      %selfconflict libgnat-7
 
 %description -n libada7
 This package contains the shared libraries required to run programs
@@ -857,10 +857,10 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-with-GCC-exception
 Group:          System/Libraries
-Provides:       libgnarl-5-32bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnarl-5-32bit
-Provides:       libgnat-5-32bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-5-32bit
+Provides:       libgnarl-7-32bit = %{version}-%{release}
+Conflicts:      %selfconflict libgnarl-7-32bit
+Provides:       libgnat-7-32bit = %{version}-%{release}
+Conflicts:      %selfconflict libgnat-7-32bit
 
 %description -n libada7-32bit
 This package contains the shared libraries required to run programs
@@ -877,10 +877,10 @@ implementation of Distributed Systems Programming (GLADE) and the Posix
 Summary:        GNU Ada Runtime Libraries
 License:        GPL-3.0-with-GCC-exception
 Group:          System/Libraries
-Provides:       libgnarl-5-64bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnarl-5-64bit
-Provides:       libgnat-5-64bit = %{version}-%{release}
-Conflicts:      %selfconflict libgnat-5-64bit
+Provides:       libgnarl-7-64bit = %{version}-%{release}
+Conflicts:      %selfconflict libgnarl-7-64bit
+Provides:       libgnat-7-64bit = %{version}-%{release}
+Conflicts:      %selfconflict libgnat-7-64bit
 
 %description -n libada7-64bit
 This package contains the shared libraries required to run programs
@@ -3067,14 +3067,14 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc7-locale.lang
 
 %files -n libada7
 %defattr(-,root,root)
-%mainlib libgnarl-*.so
-%mainlib libgnat-*.so
+%mainlib libgnarl%{binsuffix}.so
+%mainlib libgnat%{binsuffix}.so
 
 %if %{separate_biarch}
 %files -n libada7%{separate_biarch_suffix}
 %defattr(-,root,root)
-%biarchlib libgnarl-*.so
-%biarchlib libgnat-*.so
+%biarchlib libgnarl%{binsuffix}.so
+%biarchlib libgnat%{binsuffix}.so
 %endif
 %endif