pool/yaz
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 46204 from Documentation

Browse Source 
Copy from Documentation/yaz based on submit request 46204 from user keichwa

OBS-URL: https://build.opensuse.org/request/show/46204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yaz?expand=0&rev=16
This commit is contained in:
OBS User autobuild 2010-08-27 13:28:10 +00:00 committed by Git OBS Bridge
parent aa9e14aa2e
commit b05461530c
8 changed files with 35 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yaz-3.0.50.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b755f3cd18a5077ee98e3403c0e59eae27a875cce5621c15f93f032afd932d9
size 1628306

10
yaz-3.0.34-client.diff → yaz-4.0.12-client.diff
View File

@ -1,6 +1,6 @@
--- yaz-3.0.34/client/client.c.orig 2008-06-09 17:07:21.000000000 +0200
+++ yaz-3.0.34/client/client.c 2008-07-03 10:27:57.000000000 +0200
@@ -2379,6 +2379,7 @@
--- yaz-4.0.12/client/client.c.orig 2010-08-16 13:05:23.000000000 +0200
+++ yaz-4.0.12/client/client.c 2010-08-25 14:02:44.000000000 +0200
@@ -2533,6 +2533,7 @@
int noread = 0;
Odr_oid *oid;
char oid_str[51];
@ -8,7 +8,7 @@
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
@@ -2398,7 +2399,8 @@
@@ -2552,7 +2553,8 @@
return 0;
}
arg += noread;
@ -18,5 +18,3 @@
&ext->u.single_ASN1_type->len) == 0)
return 0;
Diff finished. Thu Jul 3 10:29:21 2008

11
yaz-4.0.12-codecleanup.diff Normal file
View File

@ -0,0 +1,11 @@
--- yaz-4.0.12/src/zoom-c.c.orig 2010-08-16 13:48:10.000000000 +0200
+++ yaz-4.0.12/src/zoom-c.c 2010-08-25 14:06:54.000000000 +0200
@@ -1628,7 +1628,7 @@
static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
{
int i;
- int *start, *count;
+ int *start=0, *count=0;
ZOOM_resultset resultset = 0;
Z_SRW_PDU *sr = 0;
const char *option_val = 0;

3
yaz-4.0.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc15f645b4f9f53d1809e3ba988910d37170210e97187a759698b0b145d0571d
size 1722243

24
yaz-codecleanup.36.diff
View File

@ -1,24 +0,0 @@
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_defined = 0;
int ordered = 0;
int proxrel = 2; /* less than or equal */
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;
- int *start, *count;
+ int *start=0, *count=0;
ZOOM_resultset resultset = 0;
Z_SRW_PDU *sr = 0;
const char *option_val = 0;

30
yaz-codecleanup.44.diff
View File

@ -1,30 +0,0 @@
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
{
- xmlChar *buf_out = 0;
+ union { char *cp; xmlChar *xmlp; }buf_out = { NULL };
int len_out = 0;
- xmlDocDumpMemory(doc, &buf_out, &len_out);
+ xmlDocDumpMemory(doc, &buf_out.xmlp, &len_out);
- if (!len_out || !buf_out)
+ if (!len_out || !buf_out.cp)
{
fprintf(stderr, "%s: xmlDocDumpMemory failed for query %s\n",
prog, pqf);
@@ -73,7 +73,7 @@
}
else
{
- 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

7
yaz.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 25 14:16:42 CEST 2010 - ke@suse.de
- Update to 4.0.12; for details see http://indexdata.com/yaz/doc/NEWS.
- Remove obsolete yaz-codecleanup.44.diff.
- Rebuild remaining diffs.
-------------------------------------------------------------------
Tue Nov 17 16:07:57 CET 2009 - ke@suse.de

20
yaz.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package yaz (Version 3.0.50)
# spec file for package yaz (Version 4.0.12)
#
# 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
@ -21,14 +21,13 @@
Name: yaz
BuildRequires: libicu-devel libpcap-devel libxslt-devel openssl-devel readline-devel tcpd-devel
# libxml2-devel
Version: 3.0.50
Version: 4.0.12
Release: 1
License: BSD 3-clause (or similar) ; GPL v2 or later
License: BSD3c(or similar)
Group: Development/Libraries/C and C++
Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.bz2
Patch0: yaz-codecleanup.36.diff
Patch1: yaz-codecleanup.44.diff
Patch2: yaz-3.0.34-client.diff
Patch0: yaz-4.0.12-codecleanup.diff
Patch1: yaz-4.0.12-client.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.indexdata.dk/yaz/
Summary: Z39.50/SRW/SRU Programs
@ -45,7 +44,7 @@ Authors:
Adam Dickmeiss <adam@indexdata.dk>
%package -n libyaz
License: BSD 3-clause (or similar)
License: BSD3c(or similar)
Summary: Z39.50 Library
Group: Development/Libraries/C and C++
# Requires: libxml2
@ -62,7 +61,7 @@ Authors:
Adam Dickmeiss <adam@indexdata.dk>
%package -n libyaz-devel
License: BSD 3-clause (or similar)
License: BSD3c(or similar)
Summary: Z39.50 Library
Group: Development/Libraries/C and C++
Requires: libyaz = %{version}
@ -82,7 +81,6 @@ Authors:
%setup -q
%patch0 -p 1
%patch1 -p 1
%patch2 -p 1
%build
# --with-dsssl=/usr/share/sgml/docbook/dsssl-stylesheets \
@ -144,6 +142,7 @@ rm -fr ${RPM_BUILD_ROOT}
%{_bindir}/yaz-icu
%{_bindir}/yaz-marcdump
%{_bindir}/zoomsh
%{_bindir}/yaz-json-parse
# #%%ifarch %ix86 ia64 s390 ppc hppa
# %{_bindir}/ziffy
# #%%endif
@ -156,6 +155,7 @@ rm -fr ${RPM_BUILD_ROOT}
%{_mandir}/*/yaz-icu.*
%{_mandir}/*/yaz-log.*
%{_mandir}/*/yaz-marcdump.*
%{_mandir}/*/yaz-json-parse.*
%{_mandir}/*/bib1-attr.*
%files -n libyaz