Hello community, here is the log from the commit of package checkinstall for openSUSE:Factory checked in at Thu Feb 3 02:03:12 CET 2011. -------- --- checkinstall/checkinstall.changes 2009-12-28 04:36:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/checkinstall/checkinstall.changes 2011-02-02 13:57:32.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Feb 2 13:57:11 CET 2011 - pth@suse.de + +- Fix file list. + +------------------------------------------------------------------- +Mon Jan 31 17:55:11 CET 2011 - pth@suse.de + +- Sync factory with devel project. +- Recreate the set_buildroot patch. + +------------------------------------------------------------------- +Sat Feb 6 12:46:44 UTC 2010 - jengelh@medozas.de + +- Fix linker stage errors on sparc64 due to missing LDFLAGS + +------------------------------------------------------------------- +Tue Jan 5 22:48:51 UTC 2010 - pth@novell.com + +- Override buildroot from command line. + +------------------------------------------------------------------- +Wed Dec 30 03:29:18 UTC 2009 - pth@novell.com + +- Fix file list + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- checkinstall-ldflags.patch checkinstall-set_buildroot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ checkinstall.spec ++++++ --- /var/tmp/diff_new_pack.fg5OT6/_old 2011-02-03 02:02:51.000000000 +0100 +++ /var/tmp/diff_new_pack.fg5OT6/_new 2011-02-03 02:02:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package checkinstall (Version 1.6.2) +# spec file for package checkinstall # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -21,7 +21,7 @@ Name: checkinstall Summary: "make install" Installation Tracker Version: 1.6.2 -Release: 1 +Release: 6 License: GPLv2+ Group: Development/Tools/Building Url: http://asic-linux.com.mx/~izto/checkinstall/ @@ -32,10 +32,12 @@ Patch2: checkinstall-destdir.patch Patch3: checkinstall-makefile_cleanup.patch Patch6: checkinstall-no_fortify_source.patch +Patch10: installwatch-glibc_minor.patch Patch14: checkinstall-translations.patch.bz2 Patch15: checkinstall-install_paths.patch Patch19: checkinstall-scandir.patch -Patch10: installwatch-glibc_minor.patch +Patch20: checkinstall-ldflags.patch +Patch21: checkinstall-set_buildroot.patch Provides: installwatch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,7 +53,7 @@ Authors: -------- - Felipe Eduardo S�nchez D�az Dur�n + Felipe Eduardo Sánchez Díaz Durân %prep %setup -q @@ -61,21 +63,22 @@ %patch6 %patch14 %patch15 -#%patch16 %patch19 %patch10 +%patch20 -p1 cp %{S:1} %{S:2} ./ rm -f checkinstall checkinstallrc-dist rename -no -nb locale/*.po %build -make CFLAGS="%{optflags}" -#%check -#cd installwatch -#make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} test +# 1. Must pass -m32/-m64 to linker to choose correct output format. +# 2. ld does not accept -mXX, only gcc. (=> LD=gcc) +# 3. Because installwatch uses _init as a symbol, must use -nostdlib +make CFLAGS="%{optflags}" LD="gcc" LDFLAGS="%optflags -nostdlib" %install -make CFLAGS="%{optflags}" DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%_lib install +make CFLAGS="%{optflags}" LD="gcc" LDFLAGS="%optflags -nostdlib" \ + DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%_lib install %{find_lang} %{name} %files -f %{name}.lang ++++++ checkinstall-ldflags.patch ++++++ Lesson 87: If you write a Makefile by hand, at least do it right. Example case: ld -shared -o installwatch.so installwatch.o -ldl -lc ld: sparc:v9[sparc64] architecture of input file `installwatch.o' is incompatible with sparc[sparc32] output Well well, where's LDFLAGS... let me add it. --- installwatch/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: checkinstall-1.6.2/installwatch/Makefile =================================================================== --- checkinstall-1.6.2.orig/installwatch/Makefile +++ checkinstall-1.6.2/installwatch/Makefile @@ -22,10 +22,10 @@ ALL_CFLAGS = $(CFLAGS) $(DEFINES) all: installwatch.so installwatch.so: installwatch.o - ld -shared -o installwatch.so installwatch.o -ldl -lc + $(LD) $(LDFLAGS) -shared -o installwatch.so installwatch.o -ldl -lc installwatch.o: installwatch.c localdecls.h - gcc $(ALL_CFLAGS) -c installwatch.c + $(CC) $(ALL_CFLAGS) -c installwatch.c localdecls.h: create-localdecls ./create-localdecls @@ -52,7 +52,7 @@ tarball: clean tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION) test: install - gcc $(ALL_CFLAGS) -o test-installwatch test-installwatch.c $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o test-installwatch test-installwatch.c $(LIBS) $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch ++++++ checkinstall-set_buildroot.patch ++++++ Index: checkinstall =================================================================== --- checkinstall.orig 2009-12-26 20:17:24.000000000 +0100 +++ checkinstall 2011-01-31 18:17:56.171593541 +0100 @@ -2463,7 +2463,7 @@ cd "$DIRECTORIO_FUENTE" echo echogn "Building RPM package..." -$RPMBUILD -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log +$RPMBUILD --buildroot ${BUILDROOT} -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log okfail if [ $? -gt 0 ]; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org