diff --git a/_service b/_service
new file mode 100644
index 0000000..03b0804
--- /dev/null
+++ b/_service
@@ -0,0 +1,7 @@
+
+
+ ftp.indexdata.dk
+ http
+ /pub/yaz/yaz-5.29.0.tar.gz
+
+
\ No newline at end of file
diff --git a/yaz-4.1.7-client.diff b/yaz-4.1.7-client.diff
deleted file mode 100644
index 3478da2..0000000
--- a/yaz-4.1.7-client.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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];
-+ union { unsigned char **ucp; char **cp; }pun;
- Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
- Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
-
-@@ -2552,7 +2553,8 @@
- return 0;
- }
- arg += noread;
-- if (parse_cmd_doc(&arg, out, &asn_buf,
-+ pun.ucp = &ext->u.single_ASN1_type->buf;
-+ if (parse_cmd_doc(&arg, out, pun.ucp,
- &ext->u.single_ASN1_type->len) == 0)
- return 0;
-
diff --git a/yaz-4.2.47-implicit_definitions.patch b/yaz-4.2.47-implicit_definitions.patch
deleted file mode 100644
index a28846e..0000000
--- a/yaz-4.2.47-implicit_definitions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: yaz-4.2.47/src/sortspec.c
-===================================================================
---- yaz-4.2.47.orig/src/sortspec.c
-+++ yaz-4.2.47/src/sortspec.c
-@@ -13,6 +13,7 @@
- #include
- #include
- #include
-+#include
- #include
-
- #include
diff --git a/yaz-5.1.2-codecleanup.diff b/yaz-5.1.2-codecleanup.diff
deleted file mode 100644
index a4c62a3..0000000
--- a/yaz-5.1.2-codecleanup.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u /ssd180/ke/buildservice/Publishing/yaz/yaz-5.1.2/src/zoom-sru.c\~ /ssd180/ke/buildservice/Publishing/yaz/yaz-5.1.2/src/zoom-sru.c
---- yaz-5.1.2/src/zoom-sru.c~ 2014-02-18 07:52:49.000000000 +0100
-+++ yaz-5.1.2/src/zoom-sru.c 2014-06-03 10:48:27.215005465 +0200
-@@ -146,7 +146,7 @@
- zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
- {
- int i;
-- int *start, *count;
-+ int *start=0, *count;
- ZOOM_resultset resultset = 0;
- Z_SRW_PDU *sr = 0;
- const char *option_val = 0;
-
-Diff finished. Tue Jun 3 10:48:31 2014
diff --git a/yaz-5.29.0.tar.gz b/yaz-5.29.0.tar.gz
new file mode 100644
index 0000000..1a5b88f
--- /dev/null
+++ b/yaz-5.29.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:311bcb386d6327dfa22e0e442aea26d1be7c633eb664b9f70d982f072a130112
+size 2605544
diff --git a/yaz-5.8.1.tar.gz b/yaz-5.8.1.tar.gz
deleted file mode 100644
index 530c9d6..0000000
--- a/yaz-5.8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6d5c393ff3306b47438926b55606620307c2911a7e192aac6916fcb5fc6d8a7
-size 2538071
diff --git a/yaz.changes b/yaz.changes
index 5c244f5..fcd0f98 100644
--- a/yaz.changes
+++ b/yaz.changes
@@ -1,3 +1,115 @@
+-------------------------------------------------------------------
+Sat Mar 14 11:25:11 UTC 2020 - lars@linux-schulserver.de
+
+- Update to 5.29.0:
+ + Several fixes for danmarc(2) charset encoding and decoding.
+ YAZ-923 YAZ-924
+ + Fix yaz-marcdump silently creates MARC-records with an
+ invalid director YAZ-926
+ + Add pkg-config templates for YAZ ICU and YAZ server YAZ-925
+ 5.28.0 2019/11/28
+ + Element-set is case sensitive for yaz_retrieval. The element-set
+ name should be case insensitive, and thus, the name property
+ is matched in a case-insensive mannner. YAZ-922
+ 5.27.2 2019/10/07
+ + Fix hitting directory for docpath results in malloc failure YAZ-921
+ + Fix attempt to write HTTP to a non-listening socket loops YAZ-919
+ + Fix yaz-ztest SSL does not work when forking YAZ-918
+ 5.27.1 2018/12/03
+ + Use pkg-config to detect ICU . Closes #41
+ + Describe ZOOM option timeout
+ + Fix typos in yaz-client man page and other typos
+ 5.27.0 2018/10/08
+ + GFS: Allow External type TaskPackage response YAZ-915
+ + zoomsh: fset command YAZ-916
+ + Improve logging of extended service task type YAZ-914
+ + yaz-client: document the third arg to the show command #37
+ 5.26.1 2018/07/11
+ + Fix segv with element-set=null and split YAZ-913
+ 5.26.0 2018/07/09
+ + Allow suffix split for retrieval element-set names YAZ-912
+ + cql2ccl: case sensitive comparisons for ops etc YAZ-911
+ 5.25.0 2018/05/04
+ + ZOOM C: return extended services diagnostics separately YAZ-908
+ The diagnostic code and additional info is saved in options
+ esError and esAddinfo respectively - as part of the ZOOM package.
+ 5.24.0 2018/04/25
+ + New option for ZOOM C' record update: recordIdString (the string
+ variant of recordId). Until now only recordIdNumber and recordIdOpaque
+ was possible. YAZ-907
+ + Update for Visual Studio 2017. Bundle runtime from that compiler. YAZ-905
+ + yaz FTCBFS: uses the build architecture pkg-config YAZ-897
+ 5.23.1 2017/09/04
+ + Fix Omitted Content-Length not handled anymore YAZ-894
+ This issue was introduced by work in YAZ-878 YAZ Version 5.20.0.
+ 5.23.0 2017/08/04
+ + Allow for more Solr URL schemas YAZ-893
+ If the Solr URL contains ? it will be treated as a URL that
+ includes request handler rather than hard-coded /select. For example
+ /solr/search? . You can also pass own arguments. For example
+ /solr/search?foo=bar .
+- removed upstreamed patches:
+ + yaz-5.22.0-codecleanup.patch (yaz-5.1.2-codecleanup.diff)
+ + yaz-5.22.0-client.patch
+
+-------------------------------------------------------------------
+Mon Jul 3 15:56:11 UTC 2017 - lars@linux-schulserver.de
+
+- Update to 5.22.0
+ + rdf-lookup: Add timeout configuration option YAZ-891
+ Add yaz_url_set_timeout
+ + rdf-lookup: report error if X-Path cannot be compiled YAZ-890
+ + rdf-lookup: avoid double dash in generated XML comments
+ + rdf-lookup: fix misleading log on rdf-failures YAZ-884
+ + Add documentation for tag in xslt retrieval facility doc
+ + comstack: Fix compilation error if getaddrinfo does not exist
+ + yaz-url: ignore content-length for HTTP method HEAD YAZ-878
+ + retrieval: fix incorrect backend schema YAZ-877
+ + record_conv: allow HTTP method to be set for authority lookup
+ + record_conv: change error for unsupported backend element
+ + New type, rdf-lookup, for record conversion system (retrieval)
+ + Fix yaz_url_exec sending same uri for 2nd call
+ + cql2pqf: relation modifiers with name and value are converted
+ to proximity with unit=element. Left operand is the the primary
+ index and term. Right operand is attribute index-name mapping of name
+ and value being the relation modifier value. For example,
+ dc.title =/dc.language=dk kirke
+ could be mapped to
+ @prox 0 0 0 0 k 8 @attr 1=4 "kirke" @attr 1=54 dk
+ + Add ProximityUnit map to/from string utility
+ + New functions z_ProxUnit_to_str and z_str_to_ProxUnit.
+ + Allow multi-byte indicators for MARC subsystem
+ + JSON: to the spec check of number
+ + JSON: strict \uxxxx sequence
+ + JSON: fail for nesting more than 1000 levels
+ + JSON: distinguish between EOF and error
+ + CCL: fix r=o, r=r WRT inherited attributes YAZ-864
+ + ZOOM C: tweak when connection failed is returned
+ + ZOOM C: deal with excess bytes HTTPS case YAZ-833
+ + Fix ZOOM: crash extended services diagnostics YAZ-846
+ + Make yaz_log_reopen async-signal YAZ-845
+ + Add lock/unlock for YAZ log writes YAZ-843
+ + Fix yaz-client command args parsing broken YAZ-855
+ + yaz-client: deal with excess bytes HTTPS case YAZ-833
+ + Allow Content-Type application/sru+xml YAZ-840
+ + New yaz_xml_get_prop utility YAZ-839
+ + Extend get_org_info (snippets) to return original string YAZ-836
+ + Deal with excess bytes in HTTP response for keepalive YAZ-830
+ + Refactor ssl_put and tcpip_put to one function YAZ-832
+ + Refactor ssl_get and tcpip_get to one function YAZ-831
+ + Fix SEGV yaz-client for HTTP decoding error YAZ-829
+ + Fix buffer overflow in cmd_elements in yaz-client YAZ-828
+ + Use CONNECT for SSL backends and for Z39.50 thru HTTP proxy YAZ-825
+ + Fix http proxy fails with yaz-client YAZ-824
+ + Fix 0 ptr reference for OPAC records from XML YAZ-822
+ + Extend yaz daemon facility to assist int log rotation YAZ-818 YAZ-819
+ + Moved YAZ and many other software components to GitHub
+- yaz-record-conv now installed and packaged
+- Adjust and rename code cleanup patches (yaz-4.1.7-codecleanup.diff
+ and yaz-4.1.7-client.diff)
+- removed yaz-4.2.47-implicit_definitions.patch: somehow fixed
+ upstream (no compiler warnings any more)
+
-------------------------------------------------------------------
Thu Jan 15 11:36:33 UTC 2015 - lars@linux-schulserver.de
diff --git a/yaz.spec b/yaz.spec
index 80c7836..2604c20 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,7 +1,7 @@
#
# spec file for package yaz
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,26 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname libyaz5
Name: yaz
-Version: 5.8.1
+Version: 5.29.0
Release: 0
Summary: Z39.50 protocol server and client
License: BSD-3-Clause
Group: Development/Libraries/C and C++
-Url: http://www.indexdata.dk/yaz/
+URL: http://www.indexdata.dk/yaz/
Source: %{name}-%{version}.tar.gz
Source2: baselibs.conf
-# PATCH-FIX-UPSTREAM initialize variables properly
-Patch0: yaz-5.1.2-codecleanup.diff
-# PATCH-FIX-UPSTREAM initialize variables properly
-Patch1: yaz-4.1.7-client.diff
-# PATCH-FIX-UPSTREAM add needed ctype header
-Patch2: yaz-4.2.47-implicit_definitions.patch
+BuildRequires: gnutls-devel
BuildRequires: libicu-devel
BuildRequires: libpcap-devel
BuildRequires: libxslt-devel
@@ -86,9 +81,6 @@ using the ANSI/NISO Z39.50 protocol for Information Retrieval.
%prep
%setup -q
-%patch0 -p 1
-%patch1 -p 1
-%patch2 -p 1
%build
# --with-dsssl=/usr/share/sgml/docbook/dsssl-stylesheets \
@@ -97,6 +89,7 @@ using the ANSI/NISO Z39.50 protocol for Information Retrieval.
--enable-tcpd \
--with-xslt \
--with-openssl \
+ --with-gnutls \
--with-icu \
--disable-static \
--with-pic
@@ -112,7 +105,7 @@ cp -a doc/*.html html
# cp doc/*pdf .
ln -sf introduction.html html/index.html
# yaz.pdf
-%define DOCFILES README LICENSE NEWS
+%define DOCFILES README.md LICENSE NEWS
{
echo "%{name} documentation directory"
echo ""
@@ -145,6 +138,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_bindir}/yaz-ztest*
%{_bindir}/zoomsh
%{_bindir}/yaz-json-parse
+%{_bindir}/yaz-record-conv
%{_mandir}/*/yaz.*
%{_mandir}/*/yaz-illclient.*
%{_mandir}/*/yaz-client.*
@@ -156,6 +150,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_mandir}/*/yaz-ztest.*
%{_mandir}/*/yaz-marcdump.*
%{_mandir}/*/yaz-json-parse.*
+%{_mandir}/*/yaz-record-conv.*
%{_mandir}/*/bib1-attr.*
%dir %{_datadir}/yaz
%{_datadir}/yaz/etc
@@ -180,5 +175,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_mandir}/man1/yaz-config.*
%{_mandir}/man1/yaz-asncomp.*
%{_libdir}/pkgconfig/yaz.pc
+%{_libdir}/pkgconfig/yaz-icu.pc
+%{_libdir}/pkgconfig/yaz-server.pc
%changelog