Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at 2012-05-25 16:15:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub (Old) and /work/SRC/openSUSE:Factory/.grub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub", Maintainer is "d...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/grub/grub.changes 2012-02-23 15:32:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub.new/grub.changes 2012-05-25 16:15:52.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 10:09:27 UTC 2012 - idon...@suse.com + +- Fix build with new automake + +------------------------------------------------------------------- New: ---- grub-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.1L8pFj/_old 2012-05-25 16:15:57.000000000 +0200 +++ /var/tmp/diff_new_pack.1L8pFj/_new 2012-05-25 16:15:57.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: grub BuildRequires: automake %ifarch x86_64 @@ -73,6 +74,7 @@ Patch42: nulterminate-configfile Patch43: handle-incomplete-last-track Patch44: no-MAP_GROWSDOWN +Patch45: grub-automake.patch Url: http://www.gnu.org/software/grub/grub.en.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader @@ -136,6 +138,7 @@ %patch42 -p1 %patch43 -p1 %patch44 -p1 +%patch45 -p1 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi ++++++ grub-automake.patch ++++++ Index: grub-0.97/stage1/Makefile.am =================================================================== --- grub-0.97.orig/stage1/Makefile.am +++ grub-0.97/stage1/Makefile.am @@ -1,5 +1,6 @@ -pkglibdir = /usr/lib/grub -nodist_pkglib_DATA = stage1 + +datalibdir = /usr/lib/grub +nodist_datalib_DATA = stage1 CLEANFILES = $(nodist_pkglib_DATA) Index: grub-0.97/stage2/Makefile.am =================================================================== --- grub-0.97.orig/stage2/Makefile.am +++ grub-0.97/stage2/Makefile.am @@ -31,8 +31,9 @@ pkglibdir = $(libdir)/$(PACKAGE)/$(host_ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec +datalibdir=$(pkglibdir) if DISKLESS_SUPPORT -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ +datalib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ nbgrub pxegrub @@ -43,7 +44,7 @@ noinst_PROGRAMS = pre_stage2.exec start. reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec else -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ +datalib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 noinst_DATA = pre_stage2 start start_eltorito -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
