|
|
@@ -12,11 +12,14 @@ Summary: grub - a Multiboot boot loader.
|
|
|
Summary(ja): grub - マルチブートローダ
|
|
|
Name: grub
|
|
|
Version: 0.97
|
|
|
-Release: 6%{?_dist_release}
|
|
|
+Release: 7%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Base
|
|
|
URL: http://www.gnu.org/software/grub/
|
|
|
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+
|
|
|
Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz
|
|
|
Source1: %{defshell}
|
|
|
|
|
|
@@ -90,7 +93,12 @@ GNU GRUB はマルチブートローダです。
|
|
|
%patch1002 -p1
|
|
|
|
|
|
# Modify grub to show the full version number
|
|
|
-sed -i 's/0\.97/%{version}-%{release}/' configure.ac
|
|
|
+sed -i 's/0\.97/%{version}-%{release}/' configure.in
|
|
|
+
|
|
|
+sed -i \
|
|
|
+ -e 's/typedef unsigned long long uint64_t;/#include <stdint.h>/' \
|
|
|
+ -e 's/#define UINT64_C.*$//' \
|
|
|
+ stage2/sha512crypt.c
|
|
|
|
|
|
%build
|
|
|
autoreconf -if
|
|
|
@@ -98,10 +106,11 @@ GCCVERS=$(gcc --version | head -1 | cut -d\ -f3 | cut -d. -f1)
|
|
|
# add "-fno-reorder-functions"
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=718722
|
|
|
# https://bugs.launchpad.net/ubuntu/+source/grub/+bug/837815
|
|
|
-CFLAGS="-Os -g -fno-strict-aliasing -Wall -Werror -Wno-shadow -Wno-unused -fno-reorder-functions"
|
|
|
-if [ "$GCCVERS" == "4" ]; then
|
|
|
+CFLAGS="-Os -g -fno-strict-aliasing -Wall -Werror -Wno-shadow -Wno-unused -fno-reorder-functions -Wno-overflow -Wno-shift-count-overflow -Wno-format-overflow -Wno-logical-not-parentheses -Wno-bool-compare"
|
|
|
+if [ "$GCCVERS" -ge "4" ]; then
|
|
|
CFLAGS="$CFLAGS -Wno-pointer-sign"
|
|
|
fi
|
|
|
+CFLAGS="$CFLAGS -I%{_includedir}"
|
|
|
export CFLAGS
|
|
|
|
|
|
%if %{efi_support}
|
|
|
@@ -138,15 +147,20 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_sbindir}
|
|
|
for i in grub grub-install grub-set-default grub-md5-crypt grub-terminfo ;do
|
|
|
ln -sf ../../sbin/$i ${RPM_BUILD_ROOT}/%{_sbindir}/$i
|
|
|
done
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}
|
|
|
-mv ${RPM_BUILD_ROOT}/%{_datadir}/grub ${RPM_BUILD_ROOT}/%{_libdir}/grub
|
|
|
-ln -sf ../%{_lib}/grub ${RPM_BUILD_ROOT}/%{_datadir}/grub
|
|
|
+
|
|
|
+#mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}
|
|
|
+#cp -af ${RPM_BUILD_ROOT}%{_datadir}/grub ${RPM_BUILD_ROOT}%{_libdir}/grub
|
|
|
|
|
|
rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
+%pre
|
|
|
+if [ -L %{_datadir}/grub ]; then
|
|
|
+ rm -f %{_datadir}/grub
|
|
|
+fi
|
|
|
+
|
|
|
%post
|
|
|
/sbin/install-info %{_infodir}/grub.info.gz %{_infodir}/dir
|
|
|
/sbin/install-info %{_infodir}/multiboot.info.gz %{_infodir}/dir
|
|
|
@@ -160,20 +174,24 @@ fi
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc COPYING INSTALL README AUTHORS BUGS ChangeLog NEWS THANKS TODO MAINTENANCE
|
|
|
-/boot/grub
|
|
|
+%license COPYING
|
|
|
+%doc INSTALL README AUTHORS BUGS ChangeLog NEWS THANKS TODO MAINTENANCE
|
|
|
+%dir /boot/grub
|
|
|
%if %{efi_support}
|
|
|
-%attr(0755,root,root) /boot/efi/EFI/vine
|
|
|
+%attr(0755,root,root) /boot/efi/EFI/vine/*
|
|
|
%endif
|
|
|
%{_syssbindir}/*
|
|
|
%{_sbindir}/*
|
|
|
%{_bindir}/*
|
|
|
-%{_datadir}/grub
|
|
|
-%{_libdir}/grub
|
|
|
+%{_datadir}/grub/*
|
|
|
+#%{_libdir}/grub/*
|
|
|
%{_infodir}/*.info*
|
|
|
%{_mandir}/man*/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Sep 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.97-7
|
|
|
+- fixed %%files to solve confict with grub2.
|
|
|
+
|
|
|
* Sun Aug 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97-6
|
|
|
- add Patch 2,3,4,5,6 from fedora
|
|
|
- add Requires: util-linux
|
tomop