Fix for refind-install script to handle a wider range of disk devices,

[refind] / refind.spec

diff --git a/refind.spec b/refind.spec
index 9057c6c1a6bb85d926e029b5f0c4c752c96f2ff0..c3849cdaa4a11ca1b7e1ccc165cf40e902778a68 100644 (file)
--- a/refind.spec
+++ b/refind.spec
@@ -1,12 +1,12 @@
 Summary: EFI boot manager software
 Name: refind
-Version: 0.9.0
+Version: 0.10.3
 Release: 1%{?dist}
 Summary: EFI boot manager software
 License: GPLv3
 URL: http://www.rodsbooks.com/refind/
 Group: System Environment/Base
-Source: refind-src-%version.zip
+Source: refind-src-%version.tar.gz
 Requires: efibootmgr
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -37,7 +37,7 @@ A graphical boot manager for EFI- and UEFI-based computers, such as all
 Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a
 boot menu showing all the EFI boot loaders on the EFI-accessible
 partitions, and optionally BIOS-bootable partitions on Macs and BIOS boot
-entries on UEFI PCs with CSMs. EFI-compatbile OSes, including Linux,
+entries on UEFI PCs with CSMs. EFI-compatible OSes, including Linux,
 provide boot loaders that rEFInd can detect and launch. rEFInd can launch
 Linux EFI boot loaders such as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and
 later kernels with EFI stub support. EFI filesystem drivers for ext2/3/4fs,
@@ -85,21 +85,32 @@ fi
 # Copy configuration and support files to /usr/share/refind-%{version}
 install -Dp -m0644 refind.conf-sample $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/
 cp -a icons $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/
-install -Dp -m0755 install.sh $RPM_BUILD_ROOT/usr/share/refind-%{version}/
+rm -rf $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/icons/svg
+install -Dp -m0755 refind-install $RPM_BUILD_ROOT/usr/share/refind-%{version}/
 
 # Copy documentation to /usr/share/doc/refind-%{version}
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/refind-%{version}
-cp -a docs/* $RPM_BUILD_ROOT/usr/share/doc/refind-%{version}/
+cp -a docs/Styles $RPM_BUILD_ROOT/usr/share/doc/refind-%{version}/
+cp -a docs/refind $RPM_BUILD_ROOT/usr/share/doc/refind-%{version}/
 install -Dp -m0644 NEWS.txt COPYING.txt LICENSE.txt README.txt CREDITS.txt $RPM_BUILD_ROOT/usr/share/doc/refind-%{version}
 
+# Copy man pages to /usr/share/man/man8
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
+install -Dp -m0644 docs/man/mvrefind.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -Dp -m0644 docs/man/mkrlconf.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -Dp -m0644 docs/man/refind-install.8 $RPM_BUILD_ROOT/usr/share/man/man8
+install -Dp -m0644 docs/man/refind-mkdefault.8 $RPM_BUILD_ROOT/usr/share/man/man8
+
 # Copy keys to /etc/refind.d/keys
 mkdir -p $RPM_BUILD_ROOT/etc/refind.d/keys
 install -Dp -m0644 keys/* $RPM_BUILD_ROOT/etc/refind.d/keys
 
 # 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/
+install -Dp -m0755 mkrlconf $RPM_BUILD_ROOT/usr/sbin/
+install -Dp -m0755 mvrefind $RPM_BUILD_ROOT/usr/sbin/
+install -Dp -m0755 refind-mkdefault $RPM_BUILD_ROOT/usr/sbin/
+ln -sr $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind-install $RPM_BUILD_ROOT/usr/sbin
 
 # Copy banners and fonts to /usr/share/refind-%{version}
 cp -a banners $RPM_BUILD_ROOT/usr/share/refind-%{version}/
@@ -111,8 +122,11 @@ cp -a fonts $RPM_BUILD_ROOT/usr/share/refind-%{version}/
 %files
 %defattr(-,root,root -)
 %doc /usr/share/doc/refind-%{version}
-/usr/sbin/mkrlconf.sh
-/usr/sbin/mvrefind.sh
+%doc /usr/share/man/man8
+/usr/sbin/mkrlconf
+/usr/sbin/mvrefind
+/usr/sbin/refind-install
+/usr/sbin/refind-mkdefault
 /usr/share/refind-%{version}
 /etc/refind.d/
 
@@ -150,30 +164,38 @@ declare OpenSSL=`which openssl 2> /dev/null`
 # encourage users to use their own local keys.
 if [[ $IsSecureBoot == "1" && -n $ShimFile ]] ; then
    if [[ -n $SBSign && -n $OpenSSL ]] ; then
-      ./install.sh --shim $ShimFile --localkeys --yes
+      ./refind-install --shim $ShimFile --localkeys --yes
    else
-      ./install.sh --shim $ShimFile --yes
+      ./refind-install --shim $ShimFile --yes
    fi
 else
-   if [[ -n $SBSign && -n $OpenSSL ]] ; then
-      ./install.sh --localkeys --yes
-   else
-      ./install.sh --yes
-   fi
+   ./refind-install --yes
 fi
 
 # CAUTION: Don't create a %preun or a %postun script that deletes the files
-# installed by install.sh, since that script will run after an update, thus
-# wiping out the just-updated files.
+# installed by refind-install, since that script will run after an update,
+# thus wiping out the just-updated files.
 
 %changelog
+* Sun Apr 24 2016 R Smith <rodsmith@rodsbooks.com> - 0.10.3
+- Updated spec file for 0.10.3
+* Tue Jan 26 2016 R Smith <rodsmith@rodsbooks.com> - 0.10.2
+- Updated spec file for 0.10.2
+* Sat Dec 12 2015 R Smith <rodsmith@rodsbooks.com> - 0.10.1
+- Updated spec file for 0.10.1
+* Sun Nov 8 2015 R Smith <rodsmith@rodsbooks.com> - 0.10.0
+- Updated spec file for 0.10.0
+* Sat Sep 19 2015 R Smith <rodsmith@rodsbooks.com> - 0.9.2
+- Updated spec file for 0.9.2
+* Sun Sep 13 2015 R Smith <rodsmith@rodsbooks.com> - 0.9.1
+- Updated spec file for 0.9.1
 * Sun Jul 26 2015 R Smith <rodsmith@rodsbooks.com> - 0.9.0
 - Updated spec file for 0.9.0
 * Sun Mar 1 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.7
 - Updated spec file for 0.8.7
 * Sun Feb 8 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.6
 - Updated spec file for 0.8.6
-* Sun Feb 2 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.5
+* Sun Feb 1 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.5
 - Updated spec file for 0.8.5
 * Mon Dec 8 2014 R Smith <rodsmith@rodsbooks.com> - 0.8.4
 - Updated spec file for 0.8.4