Rename the .spec file and fix some paths.

Signed-off-by: Peter Jones <pjones@redhat.com>

shim.spec

@@ -6,9 +6,9 @@
 %global _dist %{expand:%{?_module_build:%%{?dist}}}
 %global dist %{expand:%%{_dist}}
 
-Name:		shim-signed
+Name:		shim
 Version:	13
-Release:	1%{dist}
+Release:	2%{dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		http://github.com/rhboot/shim/
@@ -83,8 +83,8 @@ version signed by the UEFI signing service.				\
 
 %prep
 cd %{_builddir}
-rm -rf shim-signed-%{version}
-mkdir shim-signed-%{version}
+rm -rf shim-%{version}
+mkdir shim-%{version}
 
 %build
 %define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
@@ -144,7 +144,7 @@ rm -vf									\\\
 	shim%{-a*}-unsigned.efi						\
 %{nil}
 
-cd shim-signed-%{version}
+cd shim-%{version}
 %ifarch aarch64
 %define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64}
 %endif
@@ -173,7 +173,7 @@ install -m 0700 fb%{-a*}.efi						\\\
 %nil
 
 rm -rf $RPM_BUILD_ROOT
-cd shim-signed-%{version}
+cd shim-%{version}
 install -D -d -m 0755 $RPM_BUILD_ROOT/boot/
 install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/
 install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/
@@ -222,6 +222,9 @@ install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
 %endif
 
 %changelog
+* Wed Feb 28 2018 Peter Jones <pjones@redhat.com> - 13-2
+- Pivot the shim-signed package to be here.
+
 * Wed Nov 01 2017 Peter Jones <pjones@redhat.com> - 13-1
 - Now with the actual signed 64-bit build of shim 13 for x64 as well.
 - Make everything under /boot/efi be mode 0700, since that's what FAT will