Hello community, here is the log from the commit of package deltarpm for openSUSE:Factory checked in at Tue Feb 24 00:28:30 CET 2009. -------- --- deltarpm/deltarpm.changes 2008-10-22 15:10:46.000000000 +0200 +++ deltarpm/deltarpm.changes 2009-02-16 14:56:39.768895000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 16 14:55:27 CET 2009 - coolo@suse.de + +- adapt to xz-devel API changes (could only test makedeltarpm as + our old deltas can not be applied anymore - resulting md5 is different) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- deltarpm.xz.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.l21420/_old 2009-02-24 00:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.l21420/_new 2009-02-24 00:27:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package deltarpm (Version 3.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,13 +19,13 @@ Name: deltarpm -BuildRequires: libbz2-devel lzma-alpha-devel rpm-devel +BuildRequires: libbz2-devel rpm-devel xz-devel Url: ftp://ftp.suse.com/pub/projects/deltarpm License: BSD 3-Clause Group: System/Packages AutoReqProv: on Version: 3.4 -Release: 103 +Release: 104 Summary: Tools to Create and Apply deltarpms Source: deltarpm-3.4.tar.bz2 Source1: drpmsync @@ -33,6 +33,7 @@ Patch2: deltarpm.lzma.diff Patch3: deltarpm.norpms.diff Patch4: deltarpm.opentypo.diff +Patch5: deltarpm.xz.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # we need to build against recent rpm, so avoid the new payload %define _binary_payload w9.bzdio @@ -58,6 +59,7 @@ %patch2 %patch3 %patch4 +%patch5 -p1 cp -p %SOURCE1 . %build @@ -77,6 +79,9 @@ %endif %changelog +* Mon Feb 16 2009 coolo@suse.de +- adapt to xz-devel API changes (could only test makedeltarpm as + our old deltas can not be applied anymore - resulting md5 is different) * Wed Oct 22 2008 mls@suse.de - add lzma and bzip2 devel packages to the buildrequires * Thu Oct 02 2008 mls@suse.de ++++++ deltarpm.xz.diff ++++++ Index: deltarpm-3.4/cfile.c =================================================================== --- deltarpm-3.4.orig/cfile.c +++ deltarpm-3.4/cfile.c @@ -656,8 +656,9 @@ crunread_gz(struct cfile *f, void *buf, static struct cfile * cropen_lz(struct cfile *f) { - f->strm.lz = LZMA_STREAM_INIT_VAR; - if (lzma_auto_decoder(&f->strm.lz, 0, 0) != LZMA_OK) + lzma_stream tmp = LZMA_STREAM_INIT; + f->strm.lz = tmp; + if (lzma_auto_decoder(&f->strm.lz, 1 << 24, 0) != LZMA_OK) { free(f); return 0; @@ -726,14 +727,13 @@ crclose_lz(struct cfile *f) static struct cfile * cwopen_lz(struct cfile *f) { - lzma_options_alone alone; + lzma_options_lzma alone; + lzma_stream tmp = LZMA_STREAM_INIT; if (!f->level) f->level = 3; - lzma_init_encoder(); - f->strm.lz = LZMA_STREAM_INIT_VAR; - alone.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN; - memcpy(&alone.lzma, &lzma_preset_lzma[f->level - 1], sizeof(alone.lzma)); + f->strm.lz = tmp; + lzma_lzma_preset(&alone, f->level - 1); if (lzma_alone_encoder(&f->strm.lz, &alone) != LZMA_OK) { free(f); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org