X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec.in;h=645e05c3676c9fd6944959e1a669df20c6b95e36;hp=1e3c40013ec54b61946cde04efaf3887de3dc154;hb=b6aa93dcb5c07ed09b664c006b5f33b0135a0854;hpb=93848af242b888a6aeba304be54e2ff5cc5e510f

diff --git a/yaz.spec.in b/yaz.spec.in
index 1e3c400..645e05c 100644
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -2,57 +2,63 @@ Summary: Z39.50 Programs
 Name: yaz
 Version: @VERSION@
 Release: 1
-Requires: libxslt openssl readline libyaz3 = %{version}
+Requires: libxslt gnutls readline libyaz4 = %{version}
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
 Source: yaz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libxml2-devel libxslt-devel tcp_wrappers openssl-devel readline-devel libpcap-devel libicu-devel
+%define TCPWRAPPER tcpd-devel
+%if "%{_vendor}" == "redhat"
+# Fedora requires tcp_wrappers-devel .
+%define TCPWRAPPER tcp_wrappers
+%endif
+BuildRequires: pkgconfig libxml2-devel libxslt-devel gnutls-devel readline-devel libicu-devel %{TCPWRAPPER}
 Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.dk/yaz/
+URL: http://www.indexdata.com/yaz
 
 %description
 This package contains both a test-server and clients (normal & ssl)
 for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-%package -n libyaz3
+%package -n libyaz4
 Summary: Z39.50 Library
 Group: Libraries
-Requires: libxslt openssl
+Requires: libxslt gnutls libicu
 
-%description -n libyaz3
+%description -n libyaz4
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
 Retrieval.
 
-%package -n libyaz3-devel
+%post -n libyaz4 -p /sbin/ldconfig 
+%postun -n libyaz4 -p /sbin/ldconfig 
+
+%package -n libyaz4-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyaz3 = %{version} libxml2-devel libxslt-devel
+Requires: libyaz4 = %{version} libxml2-devel libxslt-devel libicu-devel
 Conflicts: libyaz-devel
 
-%description -n libyaz3-devel
+%description -n libyaz4-devel
 Development libraries and includes for the libyaz package.
 
-%package -n yaz-ziffy
-Summary:  ziffy: the promiscuous Z39.50 APDU sniffer
-Group: Applications/Communication
-Requires: libxslt openssl libpcap libyaz3 = %{version}
-
-%description -n yaz-ziffy
-ziffy is a promiscuous Z39.50 APDU sniffer, like the popular tcpdump.
-ziffy can capture and show all Z39.50 traffic on your LAN segment.
-This packages is a special port of ziffy ported to YAZ. Note that ziffy
-is licensed under the GPL and was is by Rocco Carbone <rocco@ntop.org>.
-
 %package -n yaz-illclient
-Summary:  ILL client
+Summary: ILL client
 Group: Applications/Communication
-Requires: readline libyaz3 = %{version}
+Requires: readline libyaz4 = %{version}
 
 %description -n yaz-illclient
 yaz-illclient: an ISO ILL client.
 
+%package -n yaz-icu
+Summary: Command line utility for ICU utilities of YAZ
+Group: Applications/Communication
+Requires: libyaz4 = %{version}
+
+%description -n yaz-icu
+The yaz-icu program is a command-line based client which exposes the ICU
+chain facility of YAZ.
+
 %prep
 %setup
 
@@ -60,39 +66,41 @@ yaz-illclient: an ISO ILL client.
 
 CFLAGS="$RPM_OPT_FLAGS" \
  ./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
-	--enable-shared --enable-tcpd --with-xslt --with-openssl --with-pcap
+	--enable-shared --enable-tcpd --with-xslt --with-gnutls --with-icu
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
 make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
 	libdir=${RPM_BUILD_ROOT}/%{_libdir} install
+rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE NEWS TODO
+%doc README LICENSE NEWS
 %{_bindir}/yaz-client
 %{_bindir}/yaz-ztest
 %{_bindir}/zoomsh
 %{_bindir}/yaz-marcdump
 %{_bindir}/yaz-iconv
-%{_bindir}/yaz-icu
+%{_bindir}/yaz-json-parse
 %{_mandir}/man1/yaz-client.*
+%{_mandir}/man1/yaz-json-parse.*
 %{_mandir}/man8/yaz-ztest.*
 %{_mandir}/man1/zoomsh.*
 %{_mandir}/man1/yaz-marcdump.*
 %{_mandir}/man1/yaz-iconv.*
-%{_mandir}/man1/yaz-icu.*
 %{_mandir}/man7/yaz-log.*
+%{_mandir}/man7/bib1-attr.*
 
-%files -n libyaz3
+%files -n libyaz4
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
-%files -n libyaz3-devel
+%files -n libyaz4-devel
 %defattr(-,root,root)
 %{_bindir}/yaz-config
 %{_bindir}/yaz-asncomp
@@ -100,7 +108,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/yaz.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
-%{_libdir}/*.la
 %{_datadir}/aclocal/yaz.m4
 %{_mandir}/man1/yaz-asncomp.*
 %{_mandir}/man7/yaz.*
@@ -108,12 +115,12 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_datadir}/doc/yaz
 %{_datadir}/yaz
 
-%files -n yaz-ziffy
-%defattr(-,root,root)
-%{_bindir}/ziffy
-%{_mandir}/man1/ziffy.*
-
 %files -n yaz-illclient
 %defattr(-,root,root)
 %{_bindir}/yaz-illclient
 %{_mandir}/man1/yaz-illclient.*
+
+%files -n yaz-icu
+%defattr(-,root,root)
+%{_bindir}/yaz-icu
+%{_mandir}/man1/yaz-icu.*