Minor code cleanup

[refind] / refind.spec

diff --git a/refind.spec b/refind.spec
index 57563af56778248d17d7a59da53720ac86757fa4..429e22ba543b102090e22c4d5fb346a3644b1ee4 100644 (file)
--- a/refind.spec
+++ b/refind.spec
@@ -1,7 +1,8 @@
 Summary: EFI boot manager software
 Name: refind
-Version: 0.6.2
-Release: 2%{?dist}
+Version: 0.6.6.6
+Release: 1%{?dist}
+Summary: EFI boot manager software
 License: GPLv3
 URL: http://www.rodsbooks.com/refind/
 Group: System Environment/Base
@@ -72,7 +73,8 @@ if [[ -f %{keydir}/refind.key && -x $SBSign ]] ; then
    done
 else
    install -Dp -m0644 refind/refind*.efi $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/
-   cp -a drivers_* $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/
+   mkdir -p $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/drivers_%{efiarch}
+   cp -a drivers_%{efiarch}/* $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/drivers_%{efiarch}/
 fi
 
 # Copy configuration and support files to /usr/share/refind-%{version}
@@ -89,17 +91,23 @@ install -Dp -m0644 NEWS.txt COPYING.txt LICENSE.txt README.txt CREDITS.txt $RPM_
 mkdir -p $RPM_BUILD_ROOT/etc/refind.d/keys
 install -Dp -m0644 keys/* $RPM_BUILD_ROOT/etc/refind.d/keys
 
-# Copy mkrlconf.sh to /usr/sbin
+# Copy scripts to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -Dp -m0755 mkrlconf.sh $RPM_BUILD_ROOT/usr/sbin/
+install -Dp -m0755 mvrefind.sh $RPM_BUILD_ROOT/usr/sbin/
+
+# Copy banners and fonts to /usr/share/refind-%{version}
+cp -a banners $RPM_BUILD_ROOT/usr/share/refind-%{version}/
+cp -a fonts $RPM_BUILD_ROOT/usr/share/refind-%{version}/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root -)
 %doc /usr/share/doc/refind-%{version}
 /usr/sbin/mkrlconf.sh
+/usr/sbin/mvrefind.sh
 /usr/share/refind-%{version}
 /etc/refind.d/
 
@@ -114,7 +122,7 @@ fi
 cd /usr/share/refind-%{version}
 
 declare VarFile=`ls -d /sys/firmware/efi/vars/SecureBoot* 2> /dev/null`
-declare ShimFile=`find /boot -name shim\.efi 2> /dev/null | grep -v refind | head -n 1`
+declare ShimFile=`find /boot -name shim\.efi 2> /dev/null | head -n 1`
 declare SBSign=`which sbsign 2> /dev/null`
 declare OpenSSL=`which openssl 2> /dev/null`
 
@@ -142,7 +150,5 @@ fi
 # wiping out the just-updated files.
 
 %changelog
-* Mon Dec 31 2012 R Smith <rodsmith@rodsbooks.com> - 0.6.2-2
-- Improved installation procedures
-* Sun Dec 30 2012 R Smith <rodsmith@rodsbooks.com> - 0.6.2
-- Created spec file for 0.6.2 release
+* Sat Jan 26 2013 R Smith <rodsmith@rodsbooks.com> - 0.6.6
+- Created spec file for 0.6.6 release