SF.net SVN: gar:[22797] csw/mgar/pkg/yaz/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 7 10:17:12 CET 2014
Revision: 22797
http://sourceforge.net/p/gar/code/22797
Author: dmichelsen
Date: 2014-01-07 09:17:11 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
yaz/trunk: Update to 5.0.2
Modified Paths:
--------------
csw/mgar/pkg/yaz/trunk/Makefile
csw/mgar/pkg/yaz/trunk/checksums
Modified: csw/mgar/pkg/yaz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yaz/trunk/Makefile 2014-01-07 08:40:54 UTC (rev 22796)
+++ csw/mgar/pkg/yaz/trunk/Makefile 2014-01-07 09:17:11 UTC (rev 22797)
@@ -1,5 +1,5 @@
NAME = yaz
-VERSION = 4.2.35
+VERSION = 5.0.2
GARTYPE = v2
DESCRIPTION = Toolkit for Z39.50/SRW/SRU clients and servers
@@ -15,48 +15,45 @@
# File splitting taken from yaz.spec
-PACKAGES += CSWlibyaz4
-SPKG_DESC_CSWlibyaz4 = Toolkit for Z39.50/SRW/SRU clients and servers, libyaz.so.4
-PKGFILES_CSWlibyaz4 = $(call pkgfiles_lib,libyaz.so.4)
-# These are always bumped together
-CHECKPKG_OVERRIDES_CSWlibyaz4 += shared-lib-pkgname-mismatch
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgpg-error0
+PACKAGES += CSWlibyaz5
+SPKG_DESC_CSWlibyaz5 = Toolkit for Z39.50/SRW/SRU clients and servers, libyaz.so.5
+PKGFILES_CSWlibyaz5 = $(call pkgfiles_lib,libyaz.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgcrypt11
+PACKAGES += CSWlibyaz-icu5
+SPKG_DESC_CSWlibyaz-icu5 += $(DESCRIPTION), libyaz_icu.so.5
+PKGFILES_CSWlibyaz-icu5 += $(call pkgfiles_lib,libyaz_icu.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibyaz4
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicudata52
-PACKAGES += CSWlibyaz-icu4
-PKGFILES_CSWlibyaz-icu4 += $(call pkgfiles_lib,libyaz_icu.so.4)
-SPKG_DESC_CSWlibyaz-icu4 += $(DESCRIPTION), libyaz_icu.so.4
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicudata48
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicui18n48
+PACKAGES += CSWlibyaz-server5
+SPKG_DESC_CSWlibyaz-server5 += $(DESCRIPTION), libyaz_server.so.5
+PKGFILES_CSWlibyaz-server5 += $(call pkgfiles_lib,libyaz_server.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibyaz4
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibgcrypt11
-PACKAGES += CSWlibyaz-server4
-PKGFILES_CSWlibyaz-server4 += $(call pkgfiles_lib,libyaz_server.so.4)
-SPKG_DESC_CSWlibyaz-server4 += $(DESCRIPTION), libyaz_server.so.4
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibgcrypt11
-
PACKAGES += CSWlibyaz-dev
SPKG_DESC_CSWlibyaz-dev = Development files for libyaz
PKGFILES_CSWlibyaz-dev += $(PKGFILES_DEVEL)
@@ -64,17 +61,11 @@
PKGFILES_CSWlibyaz-dev += $(sharedstatedir)/yaz/.*
PKGFILES_CSWlibyaz-dev += $(docdir)/yaz/.*
PKGFILES_CSWlibyaz-dev += $(mandir)/man7/.*
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-icu4
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-server4
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-icu5
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-server5
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz5
OBSOLETED_BY_CSWlibyaz-dev += CSWlibyaz-devel
-# These are default locations for docbook files, they can be specified with a --with-* option
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/yaz.m4
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/share|root/opt/csw/share/aclocal/yaz.m4
-# These are the default on configuration
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/yaz/installation.unix.html
-
# %{_bindir}/yaz-config
# %{_bindir}/yaz-asncomp
# %{_includedir}/yaz
@@ -90,23 +81,15 @@
PACKAGES += CSWyaz
SPKG_DESC_CSWyaz = Toolkit for Z39.50/SRW/SRU clients and servers
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-icu4
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-server4
+# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWyaz += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibz1
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-server5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibicui18n52
RUNTIME_DEP_PKGS_CSWyaz += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWyaz += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibhistory6
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicui18n48
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-icu5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibicuuc52
REINPLACE_USRLOCAL += doc/yaz-config.1
@@ -129,13 +112,4 @@
BUILD64_LIBS_ONLY = 1
CONFIGURE_ARGS = $(DIRPATHS)
-# Skip tests for now.
-# There is one test failing:
-# Entity: line 1: parser error : Extra content at the end of the document
-# DY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93IHRvIHByb2dyYW0gYSBjb21wdXRlch4d</my>
-# ^
-# test_embed_record.c:187: FAILED: test_render( "xml; base64=/my/text()", 0, "<my>" "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw" "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93" "IHRvIHByb2dyYW0gYSBjb21wdXRlch4d" "</my>", "<?xml version=\"1.0\"?>\n" "<my><record xmlns=\"http://www.loc.gov/MARC21/slim\">\n" " <leader>00138nam a22000738a 4500</leader>\n" " <controlfield tag=\"001\"> 11224466 </controlfield>\n" " <controlfield tag=\"003\">DLC</controlfield>\n" " <datafield tag=\"100\" ind1=\"1\" ind2=\"0\">\n" " <subfield code=\"a\">Jack Collins</subfield>\n" " </datafield>\n" " <datafield tag=\"245\" ind1=\"1\" ind2=\"0\">\n" " <subfield code=\"a\">How to program a computer</subfield>\n" " </datafield>\n" "</record></my>\n")
-
-SKIPTEST ?= 1
-
include gar/category.mk
Modified: csw/mgar/pkg/yaz/trunk/checksums
===================================================================
--- csw/mgar/pkg/yaz/trunk/checksums 2014-01-07 08:40:54 UTC (rev 22796)
+++ csw/mgar/pkg/yaz/trunk/checksums 2014-01-07 09:17:11 UTC (rev 22797)
@@ -1 +1 @@
-0392d5fdbb5bda53b055e35a166adc56 yaz-4.2.35.tar.gz
+56b40086f9aa251d3cf4d8f8acee3570 yaz-5.0.2.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list