rpms/yaz/devel 001_Implicit_DSO_Linking.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 yaz.spec, 1.21, 1.22

[Guido Grazioli]

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaz/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2598

Modified Files:
	.cvsignore sources yaz.spec 
Added Files:
	001_Implicit_DSO_Linking.patch 
Log Message:
* Mon Apr 04 2010 Guido Grazioli <guido.grazioli at gmail.com> - 4.0.2-1
- Upstream 4.0.2 (major version release)
- Add patch for explicit DSO linking
- Split documentation to -doc subpackage



001_Implicit_DSO_Linking.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 001_Implicit_DSO_Linking.patch ---
--- A/test/Makefile.am	2010-04-05 18:16:24.698092563 +0200
+++ B/test/Makefile.am	2010-04-05 18:17:03.582853220 +0200
@@ -49,7 +49,7 @@
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la
-tst_icu_I18N_LDADD = ../src/libyaz_icu.la $(ICU_LIBS)
+tst_icu_I18N_LDADD = ../src/.libs/libyaz.so ../src/libyaz_icu.la $(ICU_LIBS)
 
 
 CONFIG_CLEAN_FILES=*.log


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	16 Oct 2009 12:17:36 -0000	1.15
+++ .cvsignore	5 Apr 2010 17:36:02 -0000	1.16
@@ -1 +1 @@
-yaz-3.0.49.tar.gz
+yaz-4.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Oct 2009 12:17:36 -0000	1.15
+++ sources	5 Apr 2010 17:36:02 -0000	1.16
@@ -1 +1 @@
-7402c6444386dc7db6be8bb9617e1e4d  yaz-3.0.49.tar.gz
+917353aa9fe9a7a200a798cdceeb36bd  yaz-4.0.2.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/yaz.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- yaz.spec	2 Apr 2010 11:53:29 -0000	1.21
+++ yaz.spec	5 Apr 2010 17:36:02 -0000	1.22
@@ -1,15 +1,16 @@
 Name:           yaz
-Version:        3.0.49
-Release:        2%{?dist}
+Version:        4.0.2
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.indexdata.dk/yaz/
 Source0:        http://ftp.indexdata.dk/pub/yaz/yaz-%{version}.tar.gz
+Patch0:         001_Implicit_DSO_Linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel, openssl-devel, readline-devel, libtool
+BuildRequires:  libxml2-devel, openssl-devel, readline-devel, libtool, bison
 BuildRequires:  libxslt-devel, tcp_wrappers-devel, libpcap-devel, libicu-devel
 
 %description
@@ -38,17 +39,26 @@ Requires:       pkgconfig
 Development libraries and includes for the lib%{name} package.
 
 
+%package -n %{name}-doc
+Summary:        Documentation for yaz Z39.50 programs
+Group:          Documentation
+Requires:       yaz = %{version}-%{release}
+BuildArch:      noarch
+
+%description -n %{name}-doc
+Online documentation for the %{name} package, a Z39.50 protocol
+server and client.
+
+
 %prep
 %setup -q
-# Following file prevents make install to work (conflicts with ./NEWS)
-rm doc/NEWS
-
+%patch0 -p1
+sh buildconf.sh
 
 %build
 %configure \
     --enable-tcpd \
     --enable-shared \
-    --enable-pth \
     --disable-static
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
@@ -59,6 +69,7 @@ make LIBTOOL=%{_bindir}/libtool DESTDIR=
 # Remove cruft
 find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm -f
 rm -rf %{buildroot}%{_docdir}
+rm -f docs/Makefile*
 
 
 %check
@@ -75,7 +86,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc doc/* README NEWS LICENSE
+%doc README NEWS LICENSE
 %{_bindir}/yaz-client
 %{_bindir}/yaz-ztest
 %{_bindir}/zoom*
@@ -83,6 +94,7 @@ rm -rf %{buildroot}
 %{_bindir}/yaz-iconv
 %{_bindir}/yaz-illclient
 %{_bindir}/yaz-icu
+%{_bindir}/yaz-json-parse
 %{_mandir}/man1/yaz-client.*
 %{_mandir}/man1/yaz-illclient.*
 %{_mandir}/man8/yaz-ztest.*
@@ -91,6 +103,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/yaz-iconv.*
 %{_mandir}/man1/yaz-icu.*
 %{_mandir}/man7/yaz-log.*
+%{_mandir}/man1/yaz-json-parse.*
 
 %files -n lib%{name}
 %defattr(-,root,root,-)
@@ -110,10 +123,19 @@ rm -rf %{buildroot}
 %{_mandir}/man1/yaz-asncomp.*
 %{_mandir}/man8/yaz-config.*
 
+%files -n %{name}-doc
+%defattr(-,root,root,-)
+%doc doc/* 
+
 
 %changelog
+* Mon Apr 04 2010 Guido Grazioli <guido.grazioli at gmail.com> - 4.0.2-1
+- Upstream 4.0.2 (major version release)
+- Add patch for explicit DSO linking
+- Split documentation to -doc subpackage
+
 * Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> - 3.0.49-2
-- rebuild against icu 4.4
+- Rebuild against icu 4.4
 
 * Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
 - Upstream 3.0.49 (bugfixes and feature enhancements)