From ae0cfe093786d1aed96562ede6788960f482d835a30f1d0c8b7c992986403376 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 5 Mar 2009 16:03:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yaz?expand=0&rev=10 --- yaz-3.0.34.tar.bz2 | 3 --- yaz-3.0.44.tar.bz2 | 3 +++ yaz-codecleanup.36.diff | 36 +++++++++--------------------------- yaz-codecleanup.44.diff | 22 +++++++++++++--------- yaz.changes | 6 ++++++ yaz.spec | 12 ++++++++---- 6 files changed, 39 insertions(+), 43 deletions(-) delete mode 100644 yaz-3.0.34.tar.bz2 create mode 100644 yaz-3.0.44.tar.bz2 diff --git a/yaz-3.0.34.tar.bz2 b/yaz-3.0.34.tar.bz2 deleted file mode 100644 index b10c8ba..0000000 --- a/yaz-3.0.34.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88cceab979e6984db964178193237f8a81b393dbd19c88898127ccd4b60e7356 -size 1573466 diff --git a/yaz-3.0.44.tar.bz2 b/yaz-3.0.44.tar.bz2 new file mode 100644 index 0000000..18bfc99 --- /dev/null +++ b/yaz-3.0.44.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7a669caaf97cd5275ddf1c28ce58a7cad379dc81b744a26908869c3cab17a1f +size 1578067 diff --git a/yaz-codecleanup.36.diff b/yaz-codecleanup.36.diff index bdfcc26..b8592c9 100644 --- a/yaz-codecleanup.36.diff +++ b/yaz-codecleanup.36.diff @@ -1,21 +1,19 @@ -diff -ur yaz-2.1.36/src/cqltransform.c yaz-2.1.36.new/src/cqltransform.c ---- yaz-2.1.36/src/cqltransform.c 2006-10-05 18:12:23.000000000 +0200 -+++ yaz-2.1.36.new/src/cqltransform.c 2006-10-25 07:16:57.000000000 +0200 -@@ -237,7 +237,7 @@ +diff -Nur '--exclude=*~' yaz-3.0.44/src/cqltransform.c yaz-3.0.44.new/src/cqltransform.c +--- yaz-3.0.44/src/cqltransform.c 2009-01-15 13:28:37.000000000 +0100 ++++ yaz-3.0.44.new/src/cqltransform.c 2009-03-05 16:10:11.000000000 +0100 +@@ -499,7 +499,7 @@ void *client_data) { int exclusion = 0; - int distance; /* to be filled in later depending on unit */ -+ int distance = 0; /* to be filled in later depending on unit */ ++ int distance = 0 ; /* to be filled in later depending on unit */ int distance_defined = 0; int ordered = 0; int proxrel = 2; /* less than or equal */ -Only in yaz-2.1.36.new/src: nfaxml.c.orig -Only in yaz-2.1.36.new/src: nfaxml.c.rej -diff -ur yaz-2.1.36/src/zoom-c.c yaz-2.1.36.new/src/zoom-c.c ---- yaz-2.1.36/src/zoom-c.c 2006-10-05 17:10:34.000000000 +0200 -+++ yaz-2.1.36.new/src/zoom-c.c 2006-10-25 07:16:57.000000000 +0200 -@@ -1336,7 +1336,7 @@ +diff -Nur '--exclude=*~' yaz-3.0.44/src/zoom-c.c yaz-3.0.44.new/src/zoom-c.c +--- yaz-3.0.44/src/zoom-c.c 2009-01-15 13:28:37.000000000 +0100 ++++ yaz-3.0.44.new/src/zoom-c.c 2009-03-05 16:11:25.000000000 +0100 +@@ -1490,7 +1490,7 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { int i; @@ -24,19 +22,3 @@ diff -ur yaz-2.1.36/src/zoom-c.c yaz-2.1.36.new/src/zoom-c.c ZOOM_resultset resultset = 0; Z_SRW_PDU *sr = 0; const char *option_val = 0; -diff -ur yaz-2.1.36/zoom/zoom-benchmark.c yaz-2.1.36.new/zoom/zoom-benchmark.c ---- yaz-2.1.36/zoom/zoom-benchmark.c 2006-10-05 09:35:09.000000000 +0200 -+++ yaz-2.1.36.new/zoom/zoom-benchmark.c 2006-10-25 07:16:57.000000000 +0200 -@@ -16,10 +16,10 @@ - - - /* naming events */ --static char* zoom_events[10]; -+static char* zoom_events[ZOOM_EVENT_END+1]; - - /* re-sorting event numbers to progress numbers */ --static int zoom_progress[10]; -+static int zoom_progress[ZOOM_EVENT_END+1]; - - /* commando line parameters */ - static struct parameters_t { diff --git a/yaz-codecleanup.44.diff b/yaz-codecleanup.44.diff index 2a9c252..43fa2be 100644 --- a/yaz-codecleanup.44.diff +++ b/yaz-codecleanup.44.diff @@ -1,6 +1,7 @@ ---- yaz-2.1.44/util/yaz-xmlquery.c.~1~ 2007-01-09 17:17:12.000000000 +0100 -+++ yaz-2.1.44/util/yaz-xmlquery.c 2007-01-09 17:27:26.000000000 +0100 -@@ -62,19 +62,19 @@ +diff -u /usr/src/ke/yaz/yaz-3.0.44/util/yaz-xmlquery.c\~ /usr/src/ke/yaz/yaz-3.0.44/util/yaz-xmlquery.c +--- yaz-3.0.44/util/yaz-xmlquery.c~ 2009-01-15 13:28:38.000000000 +0100 ++++ yaz-3.0.44/util/yaz-xmlquery.c 2009-03-05 16:18:40.000000000 +0100 +@@ -60,12 +60,12 @@ } else { @@ -16,11 +17,14 @@ { fprintf(stderr, "%s: xmlDocDumpMemory failed for query %s\n", prog, pqf); - exit(4); +@@ -73,7 +73,7 @@ } else -- fwrite(buf_out, len_out, 1, stdout); -+ fwrite(buf_out.cp, len_out, 1, stdout); - xmlFreeDoc(doc); - } - } + { +- if (fwrite(buf_out, len_out, 1, stdout) != 1) ++ if (fwrite(buf_out.cp, len_out, 1, stdout) != 1) + { + fprintf(stderr, "%s: write failed\n", prog); + exit(5); + +Diff finished. Thu Mar 5 16:19:08 2009 diff --git a/yaz.changes b/yaz.changes index dc02e09..65e801a 100644 --- a/yaz.changes +++ b/yaz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 5 16:40:31 CET 2009 - ke@suse.de + +- Update to 3.0.44; for details see http://indexdata.dk/yaz/NEWS. +- Adjust patch files for this version. + ------------------------------------------------------------------- Tue Jan 13 16:33:54 CET 2009 - crrodriguez@suse.de diff --git a/yaz.spec b/yaz.spec index 13f88ae..3e5fdfa 100644 --- a/yaz.spec +++ b/yaz.spec @@ -1,5 +1,5 @@ # -# spec file for package yaz (Version 3.0.34) +# spec file for package yaz (Version 3.0.44) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: yaz BuildRequires: libicu-devel libpcap-devel libxslt-devel openssl-devel readline-devel tcpd-devel # libxml2-devel -Version: 3.0.34 -Release: 26 +Version: 3.0.44 +Release: 1 License: BSD 3-Clause; GPL v2 or later Group: Development/Libraries/C and C++ Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.bz2 @@ -110,7 +110,7 @@ cp -a doc/*.html html # cp doc/*pdf . ln -sf introduction.html html/index.html # yaz.pdf -%define DOCFILES README LICENSE NEWS TODO +%define DOCFILES README LICENSE NEWS { echo "%{name} documentation directory" echo "