X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=yaz.spec;h=d5f0f713def3f0bcfe71ab4e8edb79cd50a085a7;hb=f4fac61;hp=5a7c7c55da7267b28118a1974a55c5dd5284866f;hpb=893180b4eb429b32dc9ee1b11f17c49276859d01;p=packages%2Fyaz.git

diff --git a/yaz.spec b/yaz.spec
index 5a7c7c5..d5f0f71 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,21 +1,32 @@
 Summary:	Z39.50 protocol support library
-Summary(pl.UTF-8):   Biblioteka obsługująca protokół Z39.50
+Summary(pl.UTF-8):	Biblioteka obsługująca protokół Z39.50
 Name:		yaz
-Version:	2.1.40
-Release:	1
+Version:	5.12.0
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz
-# Source0-md5:	6af7645abf178669211e14f184869816
-Patch0:		%{name}-libwrap-fix.patch
-URL:		http://www.indexdata.dk/yaz/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.8
+# Source0-md5:	70de2fde560f9ced0c5a4744d3ebdb8a
+URL:		http://www.indexdata.com/yaz/
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.11.1
+BuildRequires:	bison
+BuildRequires:	gnutls-devel
+BuildRequires:	hiredis-devel >= 0.10
+BuildRequires:	libgcrypt-devel >= 1.2
+BuildRequires:	libicu-devel >= 3.4
+BuildRequires:	libmemcached-devel >= 0.40
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libwrap-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	libxslt-devel >= 1.1.0
+BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 5.0
+BuildRequires:	tcl >= 8.2
+Requires:	hiredis >= 0.10
+Requires:	libgcrypt >= 1.2
+Requires:	libmemcached >= 0.40
+Requires:	libxslt >= 1.1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,12 +39,17 @@ korzystających z protokołu ANSI/NISO Z39.50 do uzyskiwania informacji.
 
 %package devel
 Summary:	Header files for YAZ library
-Summary(pl.UTF-8):   Pliki nagłówkowe biblioteki YAZ
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki YAZ
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	gnutls-devel
+Requires:	hiredis-devel >= 0.10
+Requires:	libgcrypt-devel >= 1.2
+Requires:	libicu-devel >= 3.4
+Requires:	libmemcached-devel >= 0.40
 Requires:	libwrap-devel
-Requires:	libxml2-devel
-Requires:	openssl-devel >= 0.9.7d
+Requires:	libxml2-devel >= 2.0
+Requires:	libxslt-devel >= 1.1.0
 
 %description devel
 Header files for YAZ library.
@@ -43,7 +59,7 @@ Pliki nagłówkowe biblioteki YAZ.
 
 %package static
 Summary:	YAZ static libraries
-Summary(pl.UTF-8):   Statyczne biblioteki YAZ
+Summary(pl.UTF-8):	Statyczne biblioteki YAZ
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -55,7 +71,6 @@ Statyczne biblioteki YAZ.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -63,9 +78,7 @@ Statyczne biblioteki YAZ.
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-shared \
-	--enable-tcpd \
-	--with-openssl
+	--enable-tcpd
 
 %{__make}
 
@@ -73,12 +86,13 @@ 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
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libyaz*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,14 +102,23 @@ 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-url
 %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.5
+%attr(755,root,root) %{_libdir}/libyaz_icu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyaz_icu.so.5
+%attr(755,root,root) %{_libdir}/libyaz_server.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyaz_server.so.5
 %dir %{_datadir}/yaz
 %{_datadir}/yaz/etc
 %{_datadir}/yaz/ill
@@ -103,22 +126,31 @@ 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/yaz-url.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
 %{_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