RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-Dec-2008 21:48:50
Branch: HEAD Handle: 2008122720485000
Modified files:
rpm CHANGES
rpm/rpmio rpmio.c
Log:
rpmio: include lzma.h header so that LZMA_VERSION actually gets defined and
can
be compared (fixes xzdio breakage).
Summary:
Revision Changes Path
1.2718 +2 -0 rpm/CHANGES
1.156 +4 -0 rpm/rpmio/rpmio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2717 -r1.2718 CHANGES
--- rpm/CHANGES 26 Dec 2008 17:53:12 -0000 1.2717
+++ rpm/CHANGES 27 Dec 2008 20:48:50 -0000 1.2718
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+ - proyvind: rpmio: include lzma.h header so that LZMA_VERSION actually
gets
+ defined and can be compared (fixes xzdio breakage).
- proyvind: xzdio: add a couple of missing print messages.
- proyvind: add %__xz macro.
- proyvind: rpmdb/tjfn: fix build breakage.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.155 -r1.156 rpmio.c
--- rpm/rpmio/rpmio.c 26 Dec 2008 18:17:50 -0000 1.155
+++ rpm/rpmio/rpmio.c 27 Dec 2008 20:48:50 -0000 1.156
@@ -58,6 +58,10 @@
# include <netinet/in_systm.h>
#endif
+#if defined(HAVE_LZMA_H)
+#include <lzma.h>
+#endif
+
#include <rpmiotypes.h>
#include <rpmmacro.h> /* XXX rpmioAccess needs rpmCleanPath()
*/
#include <rpmlua.h> /* XXX rpmioClean() calls rpmluaFree() */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
