rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 93969 from devel:openSUSE:Factory

Browse Source 
some efi package cleanup

OBS-URL: https://build.opensuse.org/request/show/93969
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2011-11-28 11:53:25 +00:00 committed by Git OBS Bridge
parent a153902afb
commit 6dc38e20d9
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grub2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Nov 28 09:40:44 CET 2011 - jslaby@suse.de
- remove doubly packaged files
- remove INSTALL from docs
- handle duplicate bindir files
-------------------------------------------------------------------
Mon Oct 31 13:08:21 CET 2011 - meissner@suse.de
- make efi exclusion more complete
-------------------------------------------------------------------
Thu Oct 27 08:16:58 UTC 2011 - aj@suse.de

22
grub2.spec
View File

@ -25,7 +25,7 @@ BuildRequires: libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit
BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel
BuildRequires: ncurses-devel
%endif
BuildRequires: bison device-mapper-devel flex lzma ruby xz
BuildRequires: bison device-mapper-devel fdupes flex lzma ruby xz
# Modules always contain just 32-bit code
%define _libdir %{_exec_prefix}/lib
@ -202,6 +202,7 @@ rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
# Defaults
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
%find_lang grub
%fdupes %buildroot%{_bindir}
%post
/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
@ -226,9 +227,12 @@ if [ -e /boot/%{name}/device.map ]; then
/sbin/update-bootloader --refresh || true
fi
%ifarch %{efi}
%post efi
/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
%endif
%preun
if [ $1 = 0 ]; then
@ -246,11 +250,14 @@ if [ $1 = 0 ]; then
rm -f /boot/%{name}/device.map
fi
%ifarch %{efi}
%preun efi
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%endif
%files -f grub-%{version}/grub.lang
%defattr(-,root,root,-)
@ -270,7 +277,7 @@ fi
# Actually, this is replaced by update-grub from scriptlets,
# but it takes care of modified persistent part
%config(noreplace) /boot/%{name}/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/INSTALL grub-%{version}/NEWS
%doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
%{_infodir}/grub-dev.info*
@ -278,14 +285,12 @@ fi
%ifarch %{efi}
%files efi -f grub-%{version}/grub.lang
%files efi
%defattr(-,root,root,-)
%dir /boot/efi
%dir /boot/efi/EFI
%attr(0755,root,root)/boot/efi/EFI/opensuse
/etc/bash_completion.d/grub
%{_libdir}/grub2-efi
%{_libdir}/grub/
%{_sbindir}/grub2-efi-mkconfig
%{_sbindir}/grub2-efi-mkdevicemap
%{_sbindir}/grub2-efi-mknetdir
@ -313,20 +318,15 @@ fi
%{_sbindir}/grub2-efi-ofpathname
%endif
%{_bindir}/grub2-efi-script-check
%dir %{_sysconfdir}/grub.d
%config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/grub.d/README
%{_sysconfdir}/grub2-efi.cfg
%config %{_sysconfdir}/default/grub
%dir /boot/grub2-efi
# Actually, this is replaced by update-grub from scriptlets,
# but it takes care of modified persistent part
%config(noreplace) /boot/grub2-efi/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/INSTALL grub-%{version}/NEWS
%doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
%exclude %{_mandir}
%{_infodir}/grub2*
%endif
%changelog