Better reporting of SIP problems; minor code cleanup.

[refind] / refind.spec

diff --git a/refind.spec b/refind.spec
index bebb870e7827a7223380c5a5d222221070a45517..7744be5709c5a09c9bb981f0460824350b0b194a 100644 (file)
--- a/refind.spec
+++ b/refind.spec
@@ -1,12 +1,12 @@
 Summary: EFI boot manager software
 Name: refind
-Version: 0.9.2
+Version: 0.9.2.7
 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)
 
@@ -85,7 +85,8 @@ 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}
@@ -98,8 +99,8 @@ 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/
 
 # Copy banners and fonts to /usr/share/refind-%{version}
 cp -a banners $RPM_BUILD_ROOT/usr/share/refind-%{version}/
@@ -111,8 +112,8 @@ 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
+/usr/sbin/mkrlconf
+/usr/sbin/mvrefind
 /usr/share/refind-%{version}
 /etc/refind.d/
 
@@ -150,21 +151,21 @@ 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
+      ./refind-install --localkeys --yes
    else
-      ./install.sh --yes
+      ./refind-install --yes
    fi
 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
 * Sat Sep 19 2015 R Smith <rodsmith@rodsbooks.com> - 0.9.2