X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec.in;h=a5bc6827c284828ed6687ecfd3507bf65d2d329f;hp=3d55e84e0f561c44c0bae2c5b959e65a628af706;hb=3a54a02da2f546427c4e5fe57f952c97f54437ea;hpb=e218239a81500b87639ea22c39089648a8eee00a

diff --git a/yaz.spec.in b/yaz.spec.in
index 3d55e84..a5bc682 100644
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -2,13 +2,17 @@ Summary: Z39.50 Programs
 Name: yaz
 Version: @VERSION@
 Release: 1
-Requires: libxslt openssl readline libyaz3 = %{version}
+Requires: libxslt gnutls readline libyaz3 = %{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"
+%define TCPWRAPPER tcp_wrappers-devel
+%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/
 
@@ -19,7 +23,7 @@ for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 %package -n libyaz3
 Summary: Z39.50 Library
 Group: Libraries
-Requires: libxslt openssl
+Requires: libxslt gnutls libicu
 
 %description -n libyaz3
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
@@ -28,20 +32,29 @@ Retrieval.
 %package -n libyaz3-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyaz3 = %{version} libxml2-devel libxslt-devel
+Requires: libyaz3 = %{version} libxml2-devel libxslt-devel libicu-devel gnutls-devel %{TCPWRAPPER}
 Conflicts: libyaz-devel
 
 %description -n libyaz3-devel
 Development libraries and includes for the libyaz package.
 
 %package -n yaz-illclient
-Summary:  ILL client
+Summary: ILL client
 Group: Applications/Communication
 Requires: readline libyaz3 = %{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: libyaz3 = %{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
 
@@ -49,7 +62,7 @@ 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
@@ -62,20 +75,19 @@ 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
 %{_mandir}/man1/yaz-client.*
 %{_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
 %defattr(-,root,root)
@@ -101,3 +113,8 @@ rm -fr ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_bindir}/yaz-illclient
 %{_mandir}/man1/yaz-illclient.*
+
+%files -n yaz-icu
+%defattr(-,root,root)
+%{_bindir}/yaz-icu
+%{_mandir}/man1/yaz-icu.*