Hello community, here is the log from the commit of package trustedgrub for openSUSE:Factory checked in at 2012-06-14 21:11:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trustedgrub (Old) and /work/SRC/openSUSE:Factory/.trustedgrub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trustedgrub", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/trustedgrub/trustedgrub.changes 2011-12-07 21:41:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.trustedgrub.new/trustedgrub.changes 2012-06-14 21:11:31.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 14 11:57:42 UTC 2012 - [email protected] + +- Fix build with new automake + +------------------------------------------------------------------- New: ---- trustedgrub-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trustedgrub.spec ++++++ --- /var/tmp/diff_new_pack.6em2nW/_old 2012-06-14 21:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6em2nW/_new 2012-06-14 21:11:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package trustedgrub # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: trustedgrub %ifarch x86_64 BuildRequires: gcc-32bit @@ -23,8 +24,6 @@ BuildRequires: ncurses-devel-32bit %endif BuildRequires: automake -License: GPL-2.0+ -Group: System/Boot Version: 1.1.3 Release: 0 Source0: TrustedGRUB-%{version}.tgz @@ -53,9 +52,12 @@ Patch29: grub-acinclude-buildid-fix.diff Patch30: remove-buildid.diff Patch31: string-ops-fix +Patch32: trustedgrub-automake.patch Url: http://trustedgrub.sf.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader with TPM support +License: GPL-2.0+ +Group: System/Boot PreReq: fileutils sh-utils Conflicts: grub ExclusiveArch: %ix86 x86_64 @@ -123,10 +125,9 @@ %patch29 -p1 %patch30 %patch31 -p1 - +%patch32 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi -%{?suse_update_config:%{suse_update_config -l -f . }} autoreconf --force --install %ifarch x86_64 EXTRACFLAGS=' -fno-stack-protector -fno-strict-aliasing -minline-all-stringops -m32 -fno-asynchronous-unwind-tables -fno-unwind-tables' @@ -162,7 +163,7 @@ %files %defattr(-,root,root) -%doc BUGS NEWS TODO README THANKS AUTHORS INSTALL ChangeLog COPYING +%doc BUGS NEWS TODO README THANKS AUTHORS ChangeLog COPYING %docdir %{_infodir} %docdir %{_mandir} %docdir /usr/share/doc/packages/grub ++++++ trustedgrub-automake.patch ++++++ --- stage1/Makefile.am.orig +++ stage1/Makefile.am @@ -1,5 +1,5 @@ -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) -nodist_pkglib_DATA = stage1 +datalibdir = /usr/lib/grub +nodist_datalib_DATA = stage1 CLEANFILES = $(nodist_pkglib_DATA) --- stage2/Makefile.am.orig +++ stage2/Makefile.am @@ -27,12 +27,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(to -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 # Stage 2 and Stage 1.5's. -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) +datalibdir = $(pkglibdir) EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec if DISKLESS_SUPPORT -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 ntfs_stage1_5 \ +datalib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 ntfs_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 +43,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 ntfs_stage1_5 \ +datalib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 ntfs_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: [email protected] For additional commands, e-mail: [email protected]
