$ git diff --patch-with-stat --summary 4725a5de6c115d0387bec62807c2a6034310e28e..94c1b5505b41d6e30d1ed821f42a7312e3da667f

 .abf.yml    |  2 +-
 libcap.spec | 36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index e7e7766..4218185 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  libcap-2.66.tar.xz: d440e60686bd542e2a6481986c63ee8de625563e
+  libcap-2.68.tar.xz: da11d8eedc6c0ab73a232d3f1f88166c416f5ba6
diff --git a/libcap.spec b/libcap.spec
index f5edcfb..ac31ab8 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -8,16 +8,20 @@
 %define _disable_ld_no_undefined 1
 
 %define major 2
-%define libname %mklibname cap %{major}
-%define libpsx %mklibname psx %{major}
+%define oldlibname %mklibname cap 2
+%define libname %mklibname cap
+%define oldlibpsx %mklibname psx 2
+%define libpsx %mklibname psx
 %define devname %mklibname cap -d
-%define lib32name libcap%{major}
-%define lib32psx libpsx%{major}
+%define oldlib32name libcap2
+%define lib32name libcap
+%define oldlib32psx libpsx2
+%define lib32psx libpsx
 %define dev32name libcap-devel
 
 Summary:	Library for getting and setting POSIX.1e capabilities
 Name:		libcap
-Version:	2.66
+Version:	2.68
 Release:	1
 Group:		System/Kernel and hardware
 License:	BSD/GPLv2
@@ -31,6 +35,11 @@ BuildRequires:	pam-devel
 BuildRequires:	devel(libattr)
 BuildRequires:	libc6
 %endif
+%if %{with compat32}
+# Since the lib32name is libcap, the main package
+# doubles as lib32package
+%rename %{oldlib32name}
+%endif
 
 %description
 %{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
@@ -66,6 +75,7 @@ specified user.
 Summary:	Library for getting and setting POSIX.1e capabilities
 Group:		System/Kernel and hardware
 Provides:	%{name} = %{EVRD}
+%rename %{oldlibname}
 
 %description -n %{libname}
 %{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
@@ -74,6 +84,7 @@ draft 15 capabilities.
 %package -n %{libpsx}
 Summary:	Library for getting and setting POSIX.1e capabilities
 Group:		System/Kernel and hardware
+%rename %{oldlibpsx}
 
 %description -n %{libpsx}
 %{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
@@ -98,17 +109,10 @@ Install %{name}-devel if you want to develop or compile applications supporting
 Linux kernel capabilities.
 
 %if %{with compat32}
-%package -n %{lib32name}
-Summary:	Library for getting and setting POSIX.1e capabilities (32-bit)
-Group:		System/Kernel and hardware
-
-%description -n %{lib32name}
-%{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
-draft 15 capabilities.
-
 %package -n %{lib32psx}
 Summary:	Library for getting and setting POSIX.1e capabilities (32-bit)
 Group:		System/Kernel and hardware
+%rename %{oldlib32psx}
 
 %description -n %{lib32psx}
 %{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
@@ -145,13 +149,13 @@ install -m644 %{SOURCE1} .
 mkdir build32
 cp -a $(ls -1 |grep -v build32) build32/
 cd build32
-%make_build BUILD_CC="gcc -m32" CC="gcc -m32" PREFIX=%{_prefix} CFLAGS="$(echo %{optflags} |sed -e 's,-m64,,g;s,-mx32,,g') -m32" LDFLAGS="$(echo %{build_ldflags} |sed -e 's,-m64,,g;s,-mx32,,g') -m32" LIBDIR=%{_prefix}/lib lib=lib PAM_CAP=no GOLANG=no
+%make_build BUILD_CC="clang" CC="gcc -m32" PREFIX=%{_prefix} CFLAGS="$(echo %{optflags} |sed -e 's,-m64,,g;s,-mx32,,g') -m32" LDFLAGS="$(echo %{build_ldflags} |sed -e 's,-m64,,g;s,-mx32,,g') -m32" LIBDIR=%{_prefix}/lib lib=lib PAM_CAP=no GOLANG=no
 cd ..
 %endif
 
 # cb ensure fPIC set for i586 as otherwise it is missed causing issues
 # FIXME get rid of GOLANG=no once we know why it's failing to build
-%make_build BUILD_CC=%{__cc} CC=%{__cc} PREFIX=%{_prefix} CFLAGS="%{optflags} -Oz -fPIC" LDFLAGS="%{build_ldflags} -lpam" LIBDIR=%{_libdir} lib=%{_lib} GOLANG=no
+%make_build BUILD_CC=clang CC=%{__cc} PREFIX=%{_prefix} CFLAGS="%{optflags} -Oz -fPIC" LDFLAGS="%{build_ldflags} -lpam" LIBDIR=%{_libdir} lib=%{_lib} GOLANG=no
 
 %install
 install -d %{buildroot}%{_sysconfdir}/security
@@ -225,7 +229,7 @@ find %{buildroot} -name "*.pc" |xargs sed -i -e 's,-L\${libdir} ,,g'
 %{_libdir}/pkgconfig/libpsx.pc
 
 %if %{with compat32}
-%files -n %{lib32name}
+%files
 %{_prefix}/lib/libcap.so.%{major}*
 
 %files -n %{lib32psx}