Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2011-11-28 12:53:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2011-10-27 13:55:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2011-11-28 12:53:27.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 28 09:40:44 CET 2011 - [email protected] + +- remove doubly packaged files +- remove INSTALL from docs +- handle duplicate bindir files + +------------------------------------------------------------------- +Mon Oct 31 13:08:21 CET 2011 - [email protected] + +- make efi exclusion more complete + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.0yzfwD/_old 2011-11-28 12:53:31.000000000 +0100 +++ /var/tmp/diff_new_pack.0yzfwD/_new 2011-11-28 12:53:31.000000000 +0100 @@ -25,7 +25,7 @@ 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 @@ # 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 @@ /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 @@ 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 @@ # 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 @@ %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 @@ %{_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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
