X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec.in;h=b111ff4a606a525db9560a2c038f148e6ed7ebab;hp=39d352420109b62ee534192866a6ac5bc3db7e93;hb=ca56262b1976c7a55c406b44e730570fb70de418;hpb=9241daf8b3104b67b2801872d0e07d6762f78b47

diff --git a/yaz.spec.in b/yaz.spec.in
index 39d3524..b111ff4 100644
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -1,14 +1,19 @@
 Summary: Z39.50 Programs
 Name: yaz
 Version: @VERSION@
-Release: 2
-Requires: libxml2 openssl libyaz = %{version}
-Copyright: YAZ License
-Group: Other
+Release: 1
+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 libxml2-devel tcp_wrappers openssl-devel readline-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/
 
@@ -16,64 +21,106 @@ URL: http://www.indexdata.dk/yaz/
 This package contains both a test-server and clients (normal & ssl)
 for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-%package -n lib%{name}
+%package -n libyaz4
 Summary: Z39.50 Library
 Group: Libraries
-Requires: libxml2 openssl readline
+Requires: libxslt gnutls libicu
 
-%description -n lib%{name}
+%description -n libyaz4
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
 Retrieval.
 
-%package -n lib%{name}-devel
+%post -p /sbin/ldconfig 
+%postun -p /sbin/ldconfig 
+
+%package -n libyaz4-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyaz = %{version}
+Requires: libyaz4 = %{version} libxml2-devel libxslt-devel libicu-devel gnutls-devel %{TCPWRAPPER}
+Conflicts: libyaz-devel
 
-%description -n lib%{name}-devel
+%description -n libyaz4-devel
 Development libraries and includes for the libyaz package.
 
+%package -n yaz-illclient
+Summary: ILL client
+Group: Applications/Communication
+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
 
 %build
 
 CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=/usr --enable-shared --enable-tcpd --with-openssl
+ ./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
+	--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}/usr mandir=${RPM_BUILD_ROOT}/usr/share/man install
+make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
+	libdir=${RPM_BUILD_ROOT}/%{_libdir} install
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE CHANGELOG TODO
-/usr/bin/yaz-client*
-/usr/bin/yaz-ztest*
-/usr/bin/zoomsh*
-/usr/share/man/man1/yaz-client-ssl.*
-/usr/share/man/man1/yaz-client.*
-/usr/share/man/man1/zoomsh.*
-/usr/share/man/man8/yaz-ztest-ssl.*
-/usr/share/man/man8/yaz-ztest.*
-
-%files -n lib%{name}
-/usr/lib/*.so.*
-/usr/share/doc/yaz
-/usr/share/yaz/z39.50
-/usr/share/yaz/ill
-/usr/share/man/man7/yaz.*
-
-%files -n lib%{name}-devel
-/usr/bin/yaz-config
-/usr/bin/yaz-comp
-/usr/include/yaz
-/usr/lib/*.so
-/usr/lib/*.a
-/usr/lib/*.[la]
-/usr/share/aclocal/yaz.m4
-/usr/share/man/man1/yaz-config.*
+%doc README LICENSE NEWS
+%{_bindir}/yaz-client
+%{_bindir}/yaz-ztest
+%{_bindir}/zoomsh
+%{_bindir}/yaz-marcdump
+%{_bindir}/yaz-iconv
+%{_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}/man7/yaz-log.*
+%{_mandir}/man7/bib1-attr.*
+
+%files -n libyaz4
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+
+%files -n libyaz4-devel
+%defattr(-,root,root)
+%{_bindir}/yaz-config
+%{_bindir}/yaz-asncomp
+%{_includedir}/yaz
+%{_libdir}/pkgconfig/yaz.pc
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_datadir}/aclocal/yaz.m4
+%{_mandir}/man1/yaz-asncomp.*
+%{_mandir}/man7/yaz.*
+%{_mandir}/man8/yaz-config.*
+%{_datadir}/doc/yaz
+%{_datadir}/yaz
+
+%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.*