From 3c47d324ed70dfdbb01ffa67dc93301dd03a4afb68a5f14267ed4bf582dc544d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 11 Sep 2011 10:59:57 +0000 Subject: [PATCH] Accepting request 81825 from home:lrupp:branches:Publishing ...updated and package rename to follow the packaging standard... - update to 4.2.14: + New ZOOM utility ZOOM_query_sortby2 + New functions yaz_sort_spec_to_{cql,type7} + rpn2solr supports Z39.58 truncation (104) + yaz-client: allow scanpos of "none" + cql2pqf: refactor truncation handling and fix Z39.58 mode + CQL/CCL/PQF conversion fixes. CCL support for Z39.58 trunc + cql2ccl: term code for all/any sequences as well + cql2ccl: fix handling of \\ + for more Information, see /usr/share/doc/packages/yaz/ChangeLog - rename libyaz to libyaz4 to follow shared library packaging standard - and move problematic files to the yaz main package OBS-URL: https://build.opensuse.org/request/show/81825 OBS-URL: https://build.opensuse.org/package/show/Publishing/yaz?expand=0&rev=13 --- yaz-4.2.0.tar.gz | 3 --- yaz-4.2.14.tar.bz2 | 3 +++ yaz.changes | 17 ++++++++++++++ yaz.spec | 57 +++++++++++++++++++++------------------------- 4 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 yaz-4.2.0.tar.gz create mode 100644 yaz-4.2.14.tar.bz2 diff --git a/yaz-4.2.0.tar.gz b/yaz-4.2.0.tar.gz deleted file mode 100644 index 88f865a..0000000 --- a/yaz-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f386ee3a73c52003a3158da4035d6af7168aa07f1f8ad8f43b95b3ef9072621 -size 2304460 diff --git a/yaz-4.2.14.tar.bz2 b/yaz-4.2.14.tar.bz2 new file mode 100644 index 0000000..8f4a77d --- /dev/null +++ b/yaz-4.2.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f21ddff9704ce6c21de20ea50faa6f962073709217307e8dd0c46db7b459cfb +size 1853543 diff --git a/yaz.changes b/yaz.changes index c2b502a..9074abb 100644 --- a/yaz.changes +++ b/yaz.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sat Sep 10 21:52:41 UTC 2011 - lars@linux-schulserver.de + +- update to 4.2.14: + + New ZOOM utility ZOOM_query_sortby2 + + New functions yaz_sort_spec_to_{cql,type7} + + rpn2solr supports Z39.58 truncation (104) + + yaz-client: allow scanpos of "none" + + cql2pqf: refactor truncation handling and fix Z39.58 mode + + CQL/CCL/PQF conversion fixes. CCL support for Z39.58 trunc + + cql2ccl: term code for all/any sequences as well + + cql2ccl: fix handling of \\ + + for more Information, see + /usr/share/doc/packages/yaz/ChangeLog +- rename libyaz to libyaz4 to follow shared library packaging + standard - and move problematic files to the yaz main package + ------------------------------------------------------------------- Tue Aug 2 15:25:11 UTC 2011 - idonmez@novell.com diff --git a/yaz.spec b/yaz.spec index 68247cc..2a06b9a 100644 --- a/yaz.spec +++ b/yaz.spec @@ -18,38 +18,39 @@ Name: yaz -# libxml2-devel -Version: 4.2.0 +Version: 4.2.14 Release: 3 License: BSD3c(or similar) Summary: Z39.50/SRW/SRU Programs Url: http://www.indexdata.dk/yaz/ Group: Development/Libraries/C and C++ -Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz +Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.bz2 Patch0: yaz-4.1.7-codecleanup.diff Patch1: yaz-4.1.7-client.diff BuildRequires: libicu-devel BuildRequires: libpcap-devel BuildRequires: libxslt-devel +BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: tcpd-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define libname libyaz4 %description This package contains both a test-server and clients (normal & ssl) for the ANSI/NISO Z39.50 protocol for Information Retrieval. SRW and SRU clients and servers are also supported. -%package -n libyaz +%package -n %{libname} License: BSD3c(or similar) Summary: Z39.50 Library Group: Development/Libraries/C and C++ -# Requires: libxml2 -# Requires: libxml2 openssl +Provides: libyaz = %{version}-%{release} +Obsoletes: libyaz < %{version} -%description -n libyaz +%description -n %{libname} YAZ is a C library for developing client - and server applications using the ANSI/NISO Z39.50 protocol for Information Retrieval. @@ -58,9 +59,10 @@ License: BSD3c(or similar) Summary: Z39.50 Library Group: Development/Libraries/C and C++ Requires: libicu-devel -Requires: libopenssl-devel +Requires: openssl-devel Requires: libxslt-devel -Requires: libyaz = %{version} +Requires: %{name} = %{version} +Requires: %{libname} = %{version} Requires: tcpd-devel %description -n libyaz-devel @@ -79,16 +81,13 @@ using the ANSI/NISO Z39.50 protocol for Information Retrieval. --enable-tcpd \ --with-xslt \ --with-openssl \ + --with-icu \ --disable-static \ --with-pic make %{?_smp_mflags} %install %{makeinstall} -#pushd doc - # make prefix=%{buildroot}/usr install -# make DESTDIR=%{buildroot} install -#popd # Unwanted doc stuff rm -fr %{buildroot}%{_datadir}/doc rm -fr html @@ -112,51 +111,47 @@ ln -sf introduction.html html/index.html done echo "" } >index.html -/sbin/ldconfig -n %{buildroot}%{_libdir} rm -f %{buildroot}%{_libdir}/*.la %clean rm -fr %{buildroot} -%post -n libyaz -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libyaz -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root) -%{_bindir}/yaz-illclient +%doc %{DOCFILES} ChangeLog +%doc index.html html %{_bindir}/yaz-client* -%{_bindir}/yaz-ztest* %{_bindir}/yaz-iconv %{_bindir}/yaz-icu +%{_bindir}/yaz-illclient %{_bindir}/yaz-marcdump +%{_bindir}/yaz-url +%{_bindir}/yaz-ztest* %{_bindir}/zoomsh %{_bindir}/yaz-json-parse -# #%%ifarch %ix86 ia64 s390 ppc hppa -# %{_bindir}/ziffy -# #%%endif +%{_mandir}/*/yaz.* %{_mandir}/*/yaz-illclient.* %{_mandir}/*/yaz-client.* -# %{_mandir}/*/ziffy.* %{_mandir}/*/zoomsh.* -%{_mandir}/*/yaz-ztest.* %{_mandir}/*/yaz-iconv.* %{_mandir}/*/yaz-icu.* %{_mandir}/*/yaz-log.* +%{_mandir}/*/yaz-url.* +%{_mandir}/*/yaz-ztest.* %{_mandir}/*/yaz-marcdump.* %{_mandir}/*/yaz-json-parse.* %{_mandir}/*/bib1-attr.* - -%files -n libyaz -%defattr(-,root,root) -%doc %{DOCFILES} -%doc index.html html -# %doc doc/yaz.pdf -%{_libdir}/*.so.* -%{_mandir}/*/yaz.* %dir %{_datadir}/yaz %{_datadir}/yaz/etc +%files -n %{libname} +%defattr(-,root,root) +%{_libdir}/*.so.* + %files -n libyaz-devel %defattr(-,root,root) %{_bindir}/yaz-config