diff --git a/hdf5.changes b/hdf5.changes
index d687e41..5aa00ac 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
 Tue Oct 17 14:07:15 UTC 2017 - eich@suse.com
 
-- Add magic to limit the number of flavors built in the OBS ring.
+- Add magic to limit the number of flavors built in the OBS ring
+  to non-HPC builds.
+- Fix %libname() for non-HPC builds.
 
 -------------------------------------------------------------------
 Fri Sep  8 14:35:32 UTC 2017 - eich@suse.com
diff --git a/hdf5.spec b/hdf5.spec
index e408ea6..93cf20e 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -35,14 +35,6 @@ ExclusiveArch:  do_not_build
  %define package_name %pname
 %endif
 
-# Magic for OBS Staging. Only build the flavors required by
-# other packages in the ring.
-%if %{with ringdisabled}
- %if "%flavor" != "serial"
-ExclusiveArch:  do_not_build
- %endif
-%endif
-
 %if "%{flavor}" == "serial"
 %undefine suffix
 %undefine mpi_flavor
@@ -109,6 +101,11 @@ ExclusiveArch:  do_not_build
 %{?with_mpi:%global my_suffix -%{mpi_flavor}}
 
 %if %{with hpc}
+# Magic for OBS Staging. Only build the flavors required by
+# other packages in the ring.
+%if %{with ringdisabled}
+ExclusiveArch:  do_not_build
+%endif
 %{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
 %{?with_mpi:%global hpc_module_pname p%{pname}}
  %define my_prefix %hpc_prefix
@@ -132,7 +129,7 @@ ExclusiveArch:  do_not_build
  %if 0%{!?package_name:1}
   %define package_name   %pname%{?my_suffix}
  %endif
- %define libname(l:s:)   lib%{pname}%{!-l:-}%{-l*}%{-s*}%{?my_suffix}
+ %define libname(l:s:)   lib%{pname}%{!-l:%{-s:-}}%{-l*}%{-s*}%{?my_suffix}
 %endif
 
 # TODO: The so numbers autodetected by update_so_version.sh