Hello community,
here is the log from the commit of package xdelta
checked in at Wed Feb 14 10:38:49 CET 2007.
--------
--- xdelta/xdelta.changes 2006-05-30 17:55:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdelta/xdelta.changes 2007-02-13 15:23:52.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Feb 13 14:24:22 CET 2007 - prusnak@suse.cz
+
+- update to 1.1.4
+ * fixed bug: compressed data from 32-bit platforms failed
+ to decompress on 64-bit platforms
+- don't build unusable static libraries
+- dropped obsoleted patches:
+ * xdelta-1.1.3-gcc4.patch
+
+-------------------------------------------------------------------
Old:
----
xdelta-1.1.3-aliasing.patch
xdelta-1.1.3-autoconf.patch
xdelta-1.1.3-gcc4.patch
xdelta-1.1.3.patch
xdelta-1.1.3.tar.bz2
xdelta-glib2.patch
New:
----
xdelta-1.1.4-aliasing.patch
xdelta-1.1.4-autoconf.patch
xdelta-1.1.4-glib2.patch
xdelta-1.1.4.patch
xdelta-1.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdelta.spec ++++++
--- /var/tmp/diff_new_pack.O12519/_old 2007-02-14 10:37:47.000000000 +0100
+++ /var/tmp/diff_new_pack.O12519/_new 2007-02-14 10:37:47.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package xdelta (Version 1.1.3)
+# spec file for package xdelta (Version 1.1.4)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,29 +11,21 @@
# norootforbuild
Name: xdelta
-%define use_glib2 1
-%if %use_glib2
-BuildRequires: gtk1-compat-devel
-%else
-BuildRequires: glib-devel
-%endif
-License: GPL
+BuildRequires: glib2-devel glibc-devel gtk1-compat-devel
+License: GNU General Public License (GPL)
Group: Productivity/Archiving/Backup
Autoreqprov: on
-Version: 1.1.3
-Release: 20
+Version: 1.1.4
+Release: 1
Summary: Binary delta generator and RCS replacement library
-Source: xdelta-%{version}.tar.bz2
-Patch: xdelta-%{version}.patch
-Patch2: xdelta-%{version}-autoconf.patch
-Patch3: xdelta-%{version}-aliasing.patch
-Patch4: xdelta-%{version}-gcc4.patch
-%if %use_glib2
-Patch5: xdelta-glib2.patch
-%endif
+Source: %{name}-%{version}.tar.bz2
+Patch: %{name}-%{version}.patch
+Patch2: %{name}-%{version}-autoconf.patch
+Patch3: %{name}-%{version}-aliasing.patch
+Patch4: %{name}-%{version}-glib2.patch
Source1: xdeltadir.pl
Source2: xdeltadir.1.gz
-URL: http://www.xcf.berkeley.edu/~jmacd/xdelta.html
+URL: http://xdelta.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq
@@ -46,22 +38,19 @@
Authors:
--------
- Josh MacDonald
+ Josh MacDonald
%prep
%setup -q
%patch
%patch2
%patch3
-%patch4 -p1
-%if %use_glib2
-%patch5
+%patch4
sed -i '
s/->list_size/->length/g
s/->list_end/->tail/g
s/->list/->head/g
' libedsio/edsio.c
-%endif
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -69,11 +58,8 @@
aclocal
autoconf
automake -a
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --libdir=%{_libdir}
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure --disable-static
make
%install
@@ -94,13 +80,21 @@
%files
%defattr(-, root, root)
%doc README NEWS COPYING AUTHORS ChangeLog
-/usr/bin/*
-/usr/include/*
-%{_libdir}/lib*
+%{_bindir}/*
+%{_includedir}/*
+%{_libdir}/libedsio*
+%{_libdir}/libxdelta*
%{_mandir}/man1/*
-/usr/share/aclocal/*
+%{_datadir}/aclocal/*
%changelog -n xdelta
+* Tue Feb 13 2007 - prusnak@suse.cz
+- update to 1.1.4
+ * fixed bug: compressed data from 32-bit platforms failed
+ to decompress on 64-bit platforms
+- don't build unusable static libraries
+- dropped obsoleted patches:
+ * xdelta-1.1.3-gcc4.patch
* Tue May 30 2006 - sbrabec@suse.cz
- Force glib2 using gtk1-compat-devel again; loki_update is gtk2.
* Wed Jan 25 2006 - mls@suse.de
++++++ xdelta-1.1.3-aliasing.patch -> xdelta-1.1.4-aliasing.patch ++++++
--- xdelta/xdelta-1.1.3-aliasing.patch 2004-09-06 08:58:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdelta/xdelta-1.1.4-aliasing.patch 2007-02-13 14:57:27.000000000 +0100
@@ -1,22 +1,3 @@
---- libedsio/default.c 2001-09-24 08:48:52.000000000 +0200
-+++ libedsio/default.c 2004-09-06 08:58:23.000000000 +0200
-@@ -7,6 +7,7 @@
- * Author: Josh MacDonald
- */
-
-+#include
- #include "edsio.h"
-
- /* Default Sink methods
-@@ -294,7 +295,7 @@
-
- source->alloc_buf = source->alloc_buf_orig;
-
-- { long x = source->alloc_buf; ALIGN_8 (x); source->alloc_buf = x; }
-+ { intptr_t x = (intptr_t) source->alloc_buf; ALIGN_8 (x); source->alloc_buf = (void *) x; }
-
- }
-
--- libedsio/edsiotest.c 2001-06-12 05:16:41.000000000 +0200
+++ libedsio/edsiotest.c 2004-09-06 08:34:29.000000000 +0200
@@ -48,6 +48,7 @@
@@ -44,7 +25,7 @@
--- xdelta.c 2001-09-24 08:59:17.000000000 +0200
+++ xdelta.c 2004-09-06 08:34:29.000000000 +0200
-@@ -1401,12 +1401,13 @@
+@@ -1416,12 +1416,13 @@
{
SerialSource* src = handle_source (cont_in);
XdeltaControl* cont;
@@ -54,6 +35,8 @@
if (! src)
return NULL;
+ /* TODO: free src */
+
- if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void**) & cont))
+ if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void **) cont_ptr))
return NULL;
++++++ xdelta-1.1.3-autoconf.patch -> xdelta-1.1.4-autoconf.patch ++++++
--- xdelta/xdelta-1.1.3-autoconf.patch 2004-09-03 19:07:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdelta/xdelta-1.1.4-autoconf.patch 2007-02-13 14:55:48.000000000 +0100
@@ -213,16 +213,3 @@
+ rm -f conf.glibtest
+])
+
---- configure.in 2001-09-24 08:59:17.000000000 +0200
-+++ configure.in 2004-09-03 17:14:54.000000000 +0200
-@@ -75,8 +75,8 @@
- AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
-
- AC_CHECK_LIB(z, gzsetparams,
-- AC_CHECK_HEADER(zlib.h,,
-- AC_MSG_ERROR(ZLIB headers not found)),
-+ [AC_CHECK_HEADER(zlib.h,,
-+ AC_MSG_ERROR(ZLIB headers not found))],
- AC_MSG_ERROR(ZLIB library not found))
-
- AC_OUTPUT(Makefile
++++++ xdelta-1.1.4-glib2.patch ++++++
--- libedsio/edsio.h
+++ libedsio/edsio.h
@@ -481,18 +481,6 @@
#endif
-/* Missing glib stuff
- */
-
-typedef struct _GQueue GQueue;
-
-struct _GQueue
-{
- GList *list;
- GList *list_end;
- guint list_size;
-};
-
/* Queues
*/
++++++ xdelta-1.1.3-aliasing.patch -> xdelta-1.1.4.patch ++++++
--- xdelta/xdelta-1.1.3-aliasing.patch 2004-09-06 08:58:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdelta/xdelta-1.1.4.patch 2007-02-13 14:34:38.000000000 +0100
@@ -1,61 +1,60 @@
---- libedsio/default.c 2001-09-24 08:48:52.000000000 +0200
-+++ libedsio/default.c 2004-09-06 08:58:23.000000000 +0200
-@@ -7,6 +7,7 @@
- * Author: Josh MacDonald
- */
-
-+#include
- #include "edsio.h"
-
- /* Default Sink methods
-@@ -294,7 +295,7 @@
-
- source->alloc_buf = source->alloc_buf_orig;
-
-- { long x = source->alloc_buf; ALIGN_8 (x); source->alloc_buf = x; }
-+ { intptr_t x = (intptr_t) source->alloc_buf; ALIGN_8 (x); source->alloc_buf = (void *) x; }
-
+--- libedsio/edsio.c
++++ libedsio/edsio.c
+@@ -296,7 +296,7 @@
+ struct timeval tv;
+ time_t t = time (NULL);
+
+- if (t < 0)
++ if (t == ((time_t)-1))
+ {
+ edsio_generate_errno_event (EC_EdsioTimeFailure);
+ goto bail;
+--- xdmain.c
++++ xdmain.c
+@@ -1063,7 +1063,7 @@
+
+ if (! (fh->in_read) (fh, buf, nbyte)) /* This is suspicious */
+ {
+- xd_error ("read failed: %s\n", g_strerror (errno));
++ xd_error ("read failed: %s\n", errno?g_strerror (errno):"Unexpected end of file");
+ return -1;
}
---- libedsio/edsiotest.c 2001-06-12 05:16:41.000000000 +0200
-+++ libedsio/edsiotest.c 2004-09-06 08:34:29.000000000 +0200
-@@ -48,6 +48,7 @@
- const char* str = "hello there";
- const char* str2;
- guint32 str2_len;
-+ const char ** str2_ptr = &str2;
-
- PropTest *pt = g_new0 (PropTest, 1);
-
-@@ -63,12 +64,12 @@
-
- g_assert (proptest_isset_bytes (pt, prop));
-
-- g_assert (proptest_get_bytes (pt, prop, (const guint8**) & str2, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-+ g_assert (proptest_get_bytes (pt, prop, (const guint8**) str2_ptr, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-
- /* kill the cache, to test persistence. */
- pt->_edsio_property_table = NULL;
-
-- g_assert (proptest_get_bytes (pt, prop, (const guint8**) & str2, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-+ g_assert (proptest_get_bytes (pt, prop, (const guint8**) str2_ptr, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-
- g_assert (proptest_unset_bytes (pt, prop));
-
---- xdelta.c 2001-09-24 08:59:17.000000000 +0200
-+++ xdelta.c 2004-09-06 08:34:29.000000000 +0200
-@@ -1401,12 +1401,13 @@
+@@ -1225,7 +1225,7 @@
+ xd_handle_map_page (XdFileHandle *fh, guint pgno, const guint8** mem)
{
- SerialSource* src = handle_source (cont_in);
+ LRU* lru;
+- guint to_map;
++ gint to_map;
+
+ #ifdef DEBUG_MAP
+ g_print ("map %p:%d\n", fh, pgno);
+@@ -1299,7 +1299,7 @@
+ return -1;
+ }
+ #else
+- if (! (lru->buffer = mmap (NULL, to_map, PROT_READ, MAP_PRIVATE, fh->fd, pgno * XD_PAGE_SIZE)))
++ if ( (lru->buffer = mmap (NULL, to_map, PROT_READ, MAP_PRIVATE, fh->fd, pgno * XD_PAGE_SIZE)) == MAP_FAILED )
+ {
+ xd_error ("mmap failed: %s\n", g_strerror (errno));
+ return -1;
+@@ -1504,7 +1504,7 @@
+ XdeltaSource* src;
XdeltaControl* cont;
-+ XdeltaControl** cont_ptr = &cont;
- SerialType type;
-
- if (! src)
- return NULL;
-
-- if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void**) & cont))
-+ if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void **) cont_ptr))
- return NULL;
-
- if (type == ST_Version0Control)
+ gboolean from_is_compressed = FALSE, to_is_compressed = FALSE;
+- guint32 control_offset, header_offset;
++ gint32 control_offset, header_offset;
+ const char* from_name, *to_name;
+ guint32 header_space[HEADER_WORDS];
+
+--- xdelta.m4
++++ xdelta.m4
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
+ dnl
+-AC_DEFUN(AM_PATH_XDELTA,
++AC_DEFUN([AM_PATH_XDELTA],
+ [dnl
+ dnl Get the cflags and libraries from the xdelta-config script
+ dnl
++++++ xdelta-1.1.3.tar.bz2 -> xdelta-1.1.4.tar.bz2 ++++++
++++ 45476 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
