X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=yaz.spec;h=eb2325b46cf2326818c26e27a1e91bbe42c52441;hb=6b067ae13bdc79e82d3e10cb4e82fe8f61a04d19;hp=56de5dc59c6bd8328da787fdf739eaf76e6178e0;hpb=4bfcb8811f834d319268ad6d6a3d5ad8daa702a7;p=packages%2Fyaz.git

diff --git a/yaz.spec b/yaz.spec
index 56de5dc..eb2325b 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,68 +1,69 @@
 Summary:	Z39.50 protocol support library
-Summary(pl):	Biblioteka obs³uguj±ca protokó³ Z39.50
+Summary(pl.UTF-8):	Biblioteka obsługująca protokół Z39.50
 Name:		yaz
-Version:	2.0.30
-Release:	1
+Version:	4.1.7
+Release:	2
 License:	BSD-like
-Vendor:		Index Data ApS <info@indexdata.dk>
 Group:		Libraries
 Source0:	http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz
-# Source0-md5:	a8c3620c67d3cb383ba49bcbff97bbd2
-Patch0:		%{name}-libwrap-fix.patch
-Patch1:		%{name}-link.patch
+# Source0-md5:	d4b94fc70bfc105fc034c4b51b7b5cae
 URL:		http://www.indexdata.dk/yaz/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	bison
+BuildRequires:	libicu-devel >= 3.4
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libwrap-devel
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	libxslt-devel >= 1.1.0
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	readline-devel
+BuildRequires:	pkgconfig
+BuildRequires:	readline-devel >= 5.0
+BuildRequires:	tcl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 YAZ is a C library for developing client - and server applications
 using the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-%description -l pl
-YAZ to biblioteka w C do tworzenia aplikacji klienckich i serwerów
-korzystaj±cych z protoko³u ANSI/NISO Z39.50 do uzyskiwania informacji.
+%description -l pl.UTF-8
+YAZ to biblioteka w C do tworzenia aplikacji klienckich i serwerów
+korzystających z protokołu ANSI/NISO Z39.50 do uzyskiwania informacji.
 
 %package devel
 Summary:	Header files for YAZ library
-Summary(pl):	Pliki nag³ówkowe biblioteki YAZ
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki YAZ
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libwrap-devel
-Requires:	libxml2-devel
+Requires:	libxml2-devel >= 2.0
+Requires:	libxslt-devel >= 1.1.0
 Requires:	openssl-devel >= 0.9.7d
 
 %description devel
 Header files for YAZ library.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki YAZ.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki YAZ.
 
 %package static
 Summary:	YAZ static libraries
-Summary(pl):	Statyczne biblioteki YAZ
+Summary(pl.UTF-8):	Statyczne biblioteki YAZ
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 YAZ static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczne biblioteki YAZ.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -76,12 +77,10 @@ Statyczne biblioteki YAZ.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	docDATA_INSTALL="install -p" \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install -C doc \
-	DESTDIR=$RPM_BUILD_ROOT
-
-mv -f $RPM_BUILD_ROOT%{_docdir}/yaz ./doc-dist
+mv -f $RPM_BUILD_ROOT%{_docdir}/yaz doc-dist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,14 +90,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE NEWS README TODO
+%doc ChangeLog LICENSE NEWS README
 %attr(755,root,root) %{_bindir}/yaz-asncomp
 %attr(755,root,root) %{_bindir}/yaz-client*
 %attr(755,root,root) %{_bindir}/yaz-iconv
+%attr(755,root,root) %{_bindir}/yaz-icu
+%attr(755,root,root) %{_bindir}/yaz-illclient
+%attr(755,root,root) %{_bindir}/yaz-json-parse
 %attr(755,root,root) %{_bindir}/yaz-marcdump
 %attr(755,root,root) %{_bindir}/yaz-ztest*
 %attr(755,root,root) %{_bindir}/zoomsh
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libyaz.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyaz.so.4
+%attr(755,root,root) %{_libdir}/libyaz_icu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyaz_icu.so.4
+%attr(755,root,root) %{_libdir}/libyaz_server.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyaz_server.so.4
 %dir %{_datadir}/yaz
 %{_datadir}/yaz/etc
 %{_datadir}/yaz/ill
@@ -106,22 +113,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/yaz-asncomp.1*
 %{_mandir}/man1/yaz-client*.1*
 %{_mandir}/man1/yaz-iconv.1*
+%{_mandir}/man1/yaz-icu.1*
+%{_mandir}/man1/yaz-illclient.1*
+%{_mandir}/man1/yaz-json-parse.1*
 %{_mandir}/man1/yaz-marcdump.1*
 %{_mandir}/man1/zoomsh.1*
+%{_mandir}/man7/bib1-attr.7*
 %{_mandir}/man7/yaz.7*
 %{_mandir}/man7/yaz-log.7*
 %{_mandir}/man8/yaz-ztest*.8*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc-dist/*
+%doc doc-dist/* 
 %attr(755,root,root) %{_bindir}/yaz-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libyaz.so
+%attr(755,root,root) %{_libdir}/libyaz_icu.so
+%attr(755,root,root) %{_libdir}/libyaz_server.so
+%{_libdir}/libyaz.la
+%{_libdir}/libyaz_icu.la
+%{_libdir}/libyaz_server.la
 %{_includedir}/yaz
+%{_pkgconfigdir}/yaz.pc
 %{_aclocaldir}/yaz.m4
-%{_mandir}/man8/yaz-config.8*
+%{_mandir}/man1/yaz-config.1*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libyaz.a
+%{_libdir}/libyaz_icu.a
+%{_libdir}/libyaz_server.a