Fix build of RPMs

Change-Id: Ia47d93c0fb3992197a205987f20d97e257bf1d01