Update to 8.14 to fix a build problem.

- Add some more ARM tweaks (dmartin)
- Better support for other distros (crosa)

.gitignore

@@ -1 +1,2 @@
-/grubby-8.9.tar.bz2
+grubby-*.tar.bz2
+clog

grubby.spec

@@ -1,5 +1,5 @@
 Name: grubby
-Version: 8.9
+Version: 8.14
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -11,7 +11,7 @@ URL: http://git.fedorahosted.org/git/grubby.git
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig glib2-devel popt-devel 
-BuildRequires: libblkid-devel
+BuildRequires: libblkid-devel git
 # for make test / getopt:
 BuildRequires: util-linux-ng
 %ifarch s390 s390x
@@ -31,6 +31,13 @@ environment.
 %prep
 %setup -q
 
+git init
+git config user.email "noone@example.com"
+git config user.name "no one"
+git add .
+git commit -a -q -m "%{version} baseline"
+git am %{patches} </dev/null
+
 %build
 make %{?_smp_mflags}
 
@@ -43,6 +50,8 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 %ifarch %{arm}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 install -p uboot $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/uboot
+mkdir -p $RPM_BUILD_ROOT/boot
+echo " " >> $RPM_BUILD_ROOT/boot/boot.scr
 %endif
 
 %clean
@@ -58,9 +67,39 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*.8*
 %ifarch %{arm}
 %config(noreplace) %{_sysconfdir}/sysconfig/uboot
+%config(noreplace) /boot/boot.scr
 %endif
 
 %changelog
+* Thu Jun 14 2012 Peter Jones <pjones@redhat.com> - 8.14-1
+- Update to 8.14 to fix a build problem.
+
+* Thu Jun 14 2012 Peter Jones <pjones@redhat.com> - 8.13-1
+- Update to 8.13
+- Add some more ARM tweaks (dmartin)
+- Better support for other distros (crosa)
+
+* Tue Jun 12 2012 Peter Jones <pjones@redhat.com> - 8.12-2
+- Support UBOOT_IMGADDR override on ARM (blc)
+
+* Thu May 31 2012 Peter Jones <pjones@redhat.com> - 8.12-1
+- Update to 8.12
+- Preserve trailing indentation when splitting line elements (mads)
+  Resolves: rhbz#742720
+- Pick last device mounted on / (pjones,bcl)
+  Related: rhbz#820340
+  Related: rhbz#820351
+
+* Wed Mar 21 2012 Peter Jones <pjones@redhat.com> - 8.11-1
+- Update to 8.11
+  Resolves: rhbz#805310
+
+* Thu Mar 15 2012 Peter Jones <pjones@redhat.com> - 8.10-1
+- Update to 8.10
+- Use "isquote" where appropriate
+- Make --remove-kenrel support titles in grub2 (jianzhong.huang)
+- Use grub2 if it's there on ppc.
+
 * Fri Mar 02 2012 Peter Jones <pjones@redhat.com> - 8.9-1
 - Refactor grub2 title extraction, making it a function (Cleber Rosa)
 - Include prefix when printing kernel information (Cleber Rosa)

sources

@@ -1 +1 @@
-f0f27d7e78ad1452e7d0bf0bf4ca0fc6  grubby-8.9.tar.bz2
+d4198131d6bdcb404ff03cf3a16d6d3b  grubby-8.14.tar.bz2