diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec
index 367e6ad..a959198 100644
--- a/ComputeLibrary.spec
+++ b/ComputeLibrary.spec
@@ -28,30 +28,10 @@ A software library for computer vision and machine learning.
 The Compute Library is a collection of low-level functions optimized for Arm CPU and GPU architectures targeted at image processing, computer vision, and machine learning.
 Library part.
 
-%package -n libarm_compute_core%{so_ver}
-Summary:        ARM Compute Library - Core part
-
-%description -n libarm_compute_core%{so_ver}
-A software library for computer vision and machine learning.
-The Compute Library is a collection of low-level functions optimized for Arm CPU and GPU architectures targeted at image processing, computer vision, and machine learning.
-Library part.
-
-%package -n libarm_compute_graph%{so_ver}
-Summary:        ARM Compute Library - Graph part
-
-%description -n libarm_compute_graph%{so_ver}
-A software library for computer vision and machine learning.
-The Compute Library is a collection of low-level functions optimized for Arm CPU and GPU architectures targeted at image processing, computer vision, and machine learning.
-Library part.
-
 %package devel
 Summary:        ARM Compute Library -- devel
 Requires:       %{name} = %{version}
 Requires:       libarm_compute%{so_ver} = %{version}
-Requires:       libarm_compute_core%{so_ver} = %{version}
-Requires:       libarm_compute_graph%{so_ver} = %{version}
-# stb headers are required
-Requires:       stb-devel
 
 %description devel
 A software library for computer vision and machine learning.
@@ -66,7 +46,7 @@ Summary:        Compute Library sample data
 Free *.npy and *.ppm files to use with example binaries.
 
 %prep
-%autosetup -p1 -n ComputeLibrary-%{version}
+%setup -q -n ComputeLibrary-%{version}
 
 %build
 scons os=linux build=native \
@@ -113,12 +93,6 @@ done
 %post -n libarm_compute%{so_ver} -p /sbin/ldconfig
 %postun -n libarm_compute%{so_ver} -p /sbin/ldconfig
 
-%post -n libarm_compute_core%{so_ver} -p /sbin/ldconfig
-%postun -n libarm_compute_core%{so_ver} -p /sbin/ldconfig
-
-%post -n libarm_compute_graph%{so_ver} -p /sbin/ldconfig
-%postun -n libarm_compute_graph%{so_ver} -p /sbin/ldconfig
-
 %if %{with computelibrary_tests}
 %check
 LD_LIBRARY_PATH="build/" build/tests/arm_compute_validation
@@ -129,15 +103,7 @@ LD_LIBRARY_PATH="build/" build/tests/arm_compute_validation
 
 %files -n libarm_compute%{so_ver}
 %license LICENSE
-%{_libdir}/libarm_compute.so.%{so_ver}*
-
-%files -n libarm_compute_core%{so_ver}
-%license LICENSE
-%{_libdir}/libarm_compute_core.so.%{so_ver}*
-
-%files -n libarm_compute_graph%{so_ver}
-%license LICENSE
-%{_libdir}/libarm_compute_graph.so.%{so_ver}*
+%{_libdir}/*.so.%{so_ver}*
 
 %files devel
 %dir %{_includedir}/arm_compute