You should have two 1099R's and only the 2nd one Traditional IRA to Roth IRA will be taxable income.
Then for contribution of IRA list it as a Traditional IRA contribution and not a Roth.
