- updated to 4.1.2 (new sonames)

- removed obsolete libwrap-fix patch

Changed files:
    yaz-libwrap-fix.patch -> 1.10
    yaz.spec -> 1.64

diff --git a/yaz-libwrap-fix.patch b/yaz-libwrap-fix.patch
deleted file mode 100644 (file)
index edddeb9..0000000
--- a/yaz-libwrap-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -burNp yaz-3.0.44/configure.ac yaz-3.0.44-dud/configure.ac
---- yaz-3.0.44/configure.ac    2009-02-17 14:21:39.000000000 +0100
-+++ yaz-3.0.44-dud/configure.ac        2009-02-26 20:46:19.762891769 +0100
-@@ -283,6 +283,7 @@ AC_DEFINE([YAZ_USE_NEW_LOG])
- dnl
- dnl ------ tcpd
- AC_ARG_ENABLE([tcpd],[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
-+WRAPLIBS=""
- if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
-     oldLibs=$LIBS
-     oldCPPFLAGS=$CPPFLAGS
-@@ -307,8 +308,11 @@ if test "$enable_tcpd" -a "$enable_tcpd"
-     else
-       AC_MSG_RESULT([yes])
-       AC_DEFINE([HAVE_TCPD_H])
-+      WRAPLIBS="-lwrap"
-     fi
-+    LIBS=$oldLibs
- fi
-+AC_SUBST(WRAPLIBS)
- dnl
- AC_SUBST([YAZ_CONFIG_CFLAGS])
- dnl
-diff -burNp yaz-3.0.44/src/Makefile.am yaz-3.0.44-dud/src/Makefile.am
---- yaz-3.0.44/src/Makefile.am 2009-01-09 14:33:37.000000000 +0100
-+++ yaz-3.0.44-dud/src/Makefile.am     2009-02-26 20:57:00.142937281 +0100
-@@ -26,7 +26,7 @@ YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tc
- YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
- 
- AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
--libyaz_la_LIBADD = $(SSL_LIBS)
-+libyaz_la_LIBADD = $(SSL_LIBS) $(WRAPLIBS)
- libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
- libyaz_server_la_LIBADD = libyaz.la
- libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)

diff --git a/yaz.spec b/yaz.spec
index ca98477e55550a1b4819336946b4d559bb078d04..eb4cca271e862cad7b089a13d371731573b0ce72 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,18 +1,17 @@
 Summary:       Z39.50 protocol support library
 Summary(pl.UTF-8):     Biblioteka obsługująca protokół Z39.50
 Name:          yaz
-Version:       3.0.44
-Release:       5
+Version:       4.1.2
+Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz
-# Source0-md5: 330730a4a7a097447ed3abe09d38e0ce
-Patch0:                %{name}-libwrap-fix.patch
+# Source0-md5: 54e76ff8ee6f460d68678df298e7da71
 URL:           http://www.indexdata.dk/yaz/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
 BuildRequires: bison
-BuildRequires: libicu-devel
+BuildRequires: libicu-devel >= 3.4
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libwrap-devel
 BuildRequires: libxml2-devel >= 2.0
@@ -61,7 +60,6 @@ Statyczne biblioteki YAZ.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -92,21 +90,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE NEWS README ChangeLog
+%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-ztest*
 %attr(755,root,root) %{_bindir}/zoomsh
 %attr(755,root,root) %{_libdir}/libyaz.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyaz.so.3
+%attr(755,root,root) %ghost %{_libdir}/libyaz.so.4
 %attr(755,root,root) %{_libdir}/libyaz_icu.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyaz_icu.so.3
+%attr(755,root,root) %ghost %{_libdir}/libyaz_icu.so.4
 %attr(755,root,root) %{_libdir}/libyaz_server.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyaz_server.so.3
+%attr(755,root,root) %ghost %{_libdir}/libyaz_server.so.4
 %dir %{_datadir}/yaz
 %{_datadir}/yaz/etc
 %{_datadir}/yaz/ill
@@ -116,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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/zoomsh.1*
 %{_mandir}/man7/bib1-attr.7*
@@ -134,9 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libyaz_icu.la
 %{_libdir}/libyaz_server.la
 %{_includedir}/yaz
-%{_aclocaldir}/yaz.m4
-%{_mandir}/man8/yaz-config.8*
 %{_pkgconfigdir}/yaz.pc
+%{_aclocaldir}/yaz.m4
+%{_mandir}/man1/yaz-config.1*
 
 %files static
 %defattr(644,root,root,755)