Hello community,
here is the log from the commit of package xdelta for openSUSE:Factory
checked in at Thu Jan 7 20:30:09 CET 2010.
--------
--- xdelta/xdelta.changes 2009-04-14 11:11:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/xdelta/xdelta.changes 2010-01-07 14:10:11.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Jan 7 14:03:16 CET 2010 - vuntz@opensuse.org
+
+- Remove unneeded gtk1-compat-devel BuildRequires.
+- Add zlib-devel BuildRequires.
+- Update xdelta-1.1.4-glib2.patch to fully convert xdelta to glib2
+ without the need of gtk1-compat, and stop editing
+ libedsio/edsio.c in %setup.
+- Update xdelta-1.1.4-autoconf.patch to remove the glib 1.x related
+ changes.
+- Remove pcre-devel Requires for devel package: it used to be
+ missing from glib2-devel Requires, but it's fixed now.
+- Use makeinstall macro.
+- Do not package .la files.
+- Move xdelta-config and m4 file to devel subpackage.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdelta.spec ++++++
--- /var/tmp/diff_new_pack.w5GwB4/_old 2010-01-07 20:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.w5GwB4/_new 2010-01-07 20:29:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xdelta (Version 1.1.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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,12 +19,12 @@
Name: xdelta
-BuildRequires: coreutils glib2-devel glibc-devel gtk1-compat-devel
-License: GPL v2 or later
+BuildRequires: coreutils glib2-devel glibc-devel zlib-devel
+License: GPLv2+
Group: Productivity/Archiving/Backup
AutoReqProv: on
Version: 1.1.4
-Release: 179
+Release: 180
Summary: Binary delta generator and RCS replacement library
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}.patch
@@ -49,11 +49,11 @@
Josh MacDonald
%package devel
-License: GPL v2 or later
+License: GPLv2+
Summary: Binary delta generator and RCS replacement library
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
-Requires: glib2-devel pcre-devel
+Requires: glib2-devel
%description devel
Xdelta is a binary delta generator and RCS replacement library. The
@@ -73,11 +73,6 @@
%patch2
%patch3
%patch4
-sed -i '
-s/->list_size/->length/g
-s/->list_end/->tail/g
-s/->list/->head/g
-' libedsio/edsio.c
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -90,7 +85,8 @@
make
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
+find %{buildroot} -type f -name "*.la" -delete -print
install -m 755 %{S:1} $RPM_BUILD_ROOT%{_bindir}/xdeltadir
install -m 644 %{S:2} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -108,15 +104,17 @@
%files
%defattr(-, root, root)
%doc README NEWS COPYING AUTHORS
-%{_bindir}/*
+%{_bindir}/xdelta
+%{_bindir}/xdeltadir
+%{_mandir}/man1/xdelta.*
+%{_mandir}/man1/xdeltadir.*
%{_libdir}/lib*.so.*
-%{_mandir}/man1/*
-%{_datadir}/aclocal/*
%files devel
%defattr(-, root, root)
%{_includedir}/*
-%{_libdir}/*.la
+%{_bindir}/xdelta-config
%{_libdir}/*.so
+%{_datadir}/aclocal/xdelta.m4
%changelog
++++++ xdelta-1.1.4-autoconf.patch ++++++
--- /var/tmp/diff_new_pack.w5GwB4/_old 2010-01-07 20:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.w5GwB4/_new 2010-01-07 20:29:39.000000000 +0100
@@ -20,196 +20,3 @@
#
#
---- acinclude.m4
-+++ acinclude.m4
-@@ -0,0 +1,190 @@
-+AC_DEFUN([AM_PATH_GLIB],
-+[dnl
-+dnl Get the cflags and libraries from the glib-config script
-+dnl
-+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
-+ glib_config_prefix="$withval", glib_config_prefix="")
-+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
-+ , enable_glibtest=yes)
-+
-+ if test x$glib_config_exec_prefix != x ; then
-+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-+ fi
-+ fi
-+ if test x$glib_config_prefix != x ; then
-+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-+ fi
-+ fi
-+
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gmodule)
-+ glib_config_args="$glib_config_args gmodule"
-+ ;;
-+ gthread)
-+ glib_config_args="$glib_config_args gthread"
-+ ;;
-+ esac
-+ done
-+
-+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+ min_glib_version=ifelse([$1], ,0.99.7,$1)
-+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+ no_glib=""
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ no_glib=yes
-+ else
-+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_glibtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of glib-config to some extent
-+dnl
-+ rm -f conf.glibtest
-+ AC_TRY_RUN([
-+#include
-+#include
-+#include
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.glibtest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_glib_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_glib_version");
-+ exit(1);
-+ }
-+
-+ if ((glib_major_version != $glib_config_major_version) ||
-+ (glib_minor_version != $glib_config_minor_version) ||
-+ (glib_micro_version != $glib_config_micro_version))
-+ {
-+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf ("*** was found! If glib-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+ (glib_minor_version != GLIB_MINOR_VERSION) ||
-+ (glib_micro_version != GLIB_MICRO_VERSION))
-+ {
-+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ }
-+ else
-+ {
-+ if ((glib_major_version > major) ||
-+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-+ printf("*** correct copy of glib-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_glib" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ echo "*** The glib-config script installed by GLIB could not be found"
-+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-+ echo "*** full path to glib-config."
-+ else
-+ if test -f conf.glibtest ; then
-+ :
-+ else
-+ echo "*** Could not run GLIB test program, checking why..."
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$LIBS $GLIB_LIBS"
-+ AC_TRY_LINK([
-+#include
-+#include
-+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+ echo "***"
-+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+ echo "*** came with the system with the command"
-+ echo "***"
-+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GLIB_CFLAGS=""
-+ GLIB_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ rm -f conf.glibtest
-+])
-+
++++++ xdelta-1.1.4-glib2.patch ++++++
--- /var/tmp/diff_new_pack.w5GwB4/_old 2010-01-07 20:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.w5GwB4/_new 2010-01-07 20:29:39.000000000 +0100
@@ -1,6 +1,8 @@
---- libedsio/edsio.h
+Index: libedsio/edsio.h
+===================================================================
+--- libedsio/edsio.h.orig
+++ libedsio/edsio.h
-@@ -481,18 +481,6 @@
+@@ -481,49 +481,6 @@ gboolean edsio_persist_proptest_uns
#endif
@@ -16,6 +18,208 @@
- guint list_size;
-};
-
- /* Queues
- */
+-/* Queues
+- */
+-
+-GQueue * g_queue_new (void);
+-void g_queue_free (GQueue *q);
+-guint g_queue_get_size (GQueue *q);
+-void g_queue_push_front (GQueue *q, gpointer data);
+-void g_queue_push_back (GQueue *q, gpointer data);
+-gpointer g_queue_pop_front (GQueue *q);
+-gpointer g_queue_pop_back (GQueue *q);
+-
+-#define g_queue_empty(queue) \
+- ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE)
+-
+-#define g_queue_peek_front(queue) \
+- ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
+- ((GQueue *)(queue))->list->data : NULL)
+-
+-#define g_queue_peek_back(queue) \
+- ((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \
+- ((GQueue *)(queue))->list_end->data : NULL)
+-
+-#define g_queue_index(queue,ptr) \
+- ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
+- g_list_index (((GQueue *)(queue))->list, (ptr)) : -1)
+-
+-#define g_queue_push g_queue_push_back
+-#define g_queue_pop g_queue_pop_front
+-#define g_queue_peek g_queue_peek_front
+-
+-
+ #ifdef __cplusplus
+ }
+ #endif
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -71,8 +71,8 @@ AC_PATH_PROGS(EMACS, emacs xemacs, emacs
+ top_srcdir_absolute=`cd $srcdir; pwd`
+ AC_SUBST(top_srcdir_absolute)
+
+-AM_PATH_GLIB(1.2.8,,
+- AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
++AM_PATH_GLIB_2_0(,,
++ AC_MSG_ERROR([Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/glib/]))
+
+ dnl AC_CHECK_LIB(z, gzsetparams, */
+ dnl AC_CHECK_HEADER(zlib.h,, */
+Index: libedsio/edsio.c
+===================================================================
+--- libedsio/edsio.c.orig
++++ libedsio/edsio.c
+@@ -179,9 +179,9 @@ eventdelivery_event_deliver (GenericEven
+ }
+ }
+
+- while (g_queue_get_size (queued) > 0)
++ while (g_queue_get_length (queued) > 0)
+ {
+- DelayedEvent* de = g_queue_pop (queued);
++ DelayedEvent* de = g_queue_pop_tail (queued);
+
+ for (i = 0; i < all_event_watchers->len; i += 1)
+ {
+@@ -211,7 +211,7 @@ eventdelivery_event_deliver (GenericEven
+ de->def = def;
+ de->msg = out->str;
+- g_queue_push (queued, de);
++ g_queue_push_head (queued, de);
+
+ g_ptr_array_add (free_strings, out);
+ }
+@@ -1481,130 +1481,3 @@ checksum_source_free (SerialSource* fsou
+
+ g_free (source);
+ }
+-
+-/* Missing glib stuff
+- */
+-
+-GQueue *
+-g_queue_new (void)
+-{
+- GQueue *q = g_new (GQueue, 1);
+-
+- q->list = q->list_end = NULL;
+- q->list_size = 0;
+-
+- return q;
+-}
+-
+-
+-void
+-g_queue_free (GQueue *q)
+-{
+- if (q)
+- {
+- if (q->list)
+- g_list_free (q->list);
+- g_free (q);
+- }
+-}
+-
+-
+-guint
+-g_queue_get_size (GQueue *q)
+-{
+- return (q == NULL) ? 0 : q->list_size;
+-}
+-
+-
+-void
+-g_queue_push_front (GQueue *q, gpointer data)
+-{
+- if (q)
+- {
+- q->list = g_list_prepend (q->list, data);
+-
+- if (q->list_end == NULL)
+- q->list_end = q->list;
+-
+- q->list_size++;
+- }
+-}
+-
+-
+-void
+-g_queue_push_back (GQueue *q, gpointer data)
+-{
+- if (q)
+- {
+- q->list_end = g_list_append (q->list_end, data);
+-
+- if (! q->list)
+- q->list = q->list_end;
+- else
+- q->list_end = q->list_end->next;
+-
+- q->list_size++;
+- }
+-}
+-
+-
+-gpointer
+-g_queue_pop_front (GQueue *q)
+-{
+- gpointer data = NULL;
+-
+- if ((q) && (q->list))
+- {
+- GList *node;
+-
+- node = q->list;
+- data = node->data;
+-
+- if (! node->next)
+- {
+- q->list = q->list_end = NULL;
+- q->list_size = 0;
+- }
+- else
+- {
+- q->list = node->next;
+- q->list->prev = NULL;
+- q->list_size--;
+- }
+-
+- g_list_free_1 (node);
+- }
+-
+- return data;
+-}
+-
+-
+-gpointer
+-g_queue_pop_back (GQueue *q)
+-{
+- gpointer data = NULL;
+-
+- if ((q) && (q->list))
+- {
+- GList *node;
+-
+- node = q->list_end;
+- data = node->data;
+-
+- if (! node->prev)
+- {
+- q->list = q->list_end = NULL;
+- q->list_size = 0;
+- }
+- else
+- {
+- q->list_end = node->prev;
+- q->list_end->next = NULL;
+- q->list_size--;
+- }
+-
+- g_list_free_1 (node);
+- }
+-
+- return data;
+-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org