X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz.spec.in;h=d6af14ae2d973ac323ef1ae787f92c382db8514d;hp=114f58703696c917dc4fe8863331f65e697a0191;hb=e1ad0cf93484f86cbdcd53c73219eef124332dfc;hpb=b4f634a3359a330e6f74c51365c9c62d0c5039b2

diff --git a/yaz.spec.in b/yaz.spec.in
index 114f587..d6af14a 100644
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -2,7 +2,7 @@ Summary: Z39.50 Programs
 Name: yaz
 Version: @VERSION@
 Release: 1
-Requires: libxslt gnutls readline libyaz3 = %{version}
+Requires: libxslt, gnutls, readline, libyaz4 = %{version}
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -13,39 +13,39 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # Fedora requires tcp_wrappers-devel .
 %define TCPWRAPPER tcp_wrappers
 %endif
-BuildRequires: pkgconfig libxml2-devel libxslt-devel gnutls-devel readline-devel libicu-devel %{TCPWRAPPER}
+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 gnutls libicu
+Requires: libxslt, gnutls, libicu
 
-%description -n libyaz3
+%description -n libyaz4
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
 Retrieval.
 
-%post -p /sbin/ldconfig 
-%postun -p /sbin/ldconfig 
+%post -n libyaz4 -p /sbin/ldconfig 
+%postun -n libyaz4 -p /sbin/ldconfig 
 
-%package -n libyaz3-devel
+%package -n libyaz4-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyaz3 = %{version} libxml2-devel libxslt-devel libicu-devel gnutls-devel %{TCPWRAPPER}
+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-illclient
 Summary: ILL client
 Group: Applications/Communication
-Requires: readline libyaz3 = %{version}
+Requires: readline, libyaz4 = %{version}
 
 %description -n yaz-illclient
 yaz-illclient: an ISO ILL client.
@@ -53,7 +53,7 @@ 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}
+Requires: libyaz4 = %{version}
 
 %description -n yaz-icu
 The yaz-icu program is a command-line based client which exposes the ICU
@@ -73,6 +73,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 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}
@@ -85,7 +86,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_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.*
@@ -93,11 +96,11 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_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
@@ -105,11 +108,10 @@ 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.*
-%{_mandir}/man8/yaz-config.*
+%{_mandir}/man?/yaz-config.*
 %{_datadir}/doc/yaz
 %{_datadir}/yaz