From: Mike Taylor Date: Thu, 16 Dec 2010 23:17:56 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/ZOOM-Perl X-Git-Tag: v1.29~38 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=370f6a934234652752aa1b26669489277c65dc3e;hp=240063c187d8f615646214c76a3c920de7d05bb4;p=ZOOM-Perl-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/ZOOM-Perl --- diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ee9babe..0000000 --- a/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -ZOOM.bs -ZOOM.c -blib -build-stamp -install-stamp -pm_to_blib diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d2dbff --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +Makefile +ZOOM.bs +ZOOM.c +ZOOM.o +blib +build-stamp +install-stamp +pm_to_blib diff --git a/Changes b/Changes index beacd0e..d999f51 100644 --- a/Changes +++ b/Changes @@ -1,8 +1,33 @@ -$Id: Changes,v 1.82 2008-09-29 16:23:18 mike Exp $ - Revision history for Perl extension Net::Z3950::ZOOM. -1.25 [IN PROGRESS] +1.28 Fri Oct 15 13:34:41 BST 2010 + - In the test-suite, provide a more explicit report when the + scan identity test (display term == term) fails. + - The displayTerm==term assertion is now case-insensitive, as + it ought always to have been: previously, the test-suite + relied on a specific implementaton detail of the + test-server, which has recently changed causing extraneous + test-suite failures. + - Also in the test-suite for scan, remove the test that all + title-terms are in the general-term list, an assumption that + should never have been made. + +1.27 Wed Aug 11 17:13:07 BST 2010 + - Support for Index Data build procedures, including making + Debian/Ubuntu and Red Hat packages from clean tarballs. + - No upstream changes -- packaging only. + +1.26 Tue Jun 8 16:43:29 BST 2010 + - Tweak the test-suite so that it works correctly on Fedora + Core 12 (2.6.31.5-127.fc12.x86_64). For some reason, + attempts to connect to a non-existent host can fail with + ERROR_TIMEOUT and no addinfo, rather than ERROR_CONNECT and + the hostname as addinfo; and the number of terms to request + in a scan needs to be explicitly specified in an option. + - Add "debclean" target to generated Makefile. + - Remove extraneous and misleading old CVS IDs. + +1.25 Fri Feb 19 15:04:26 GMT 2010 - Fix test-suite not to run the "packages" tests against test.indexdata.com, which has gone away, but against z3950.indexdata.com, like the other tests. A new server diff --git a/IDMETA b/IDMETA new file mode 100644 index 0000000..256f36f --- /dev/null +++ b/IDMETA @@ -0,0 +1,5 @@ +NAME=libnet-z3950-zoom-perl +VERSION=1.27 +OMIT_FROM_DIST="archive modules" +DEBIAN_DIST="squeeze lenny" +UBUNTU_DIST="lucid karmic" diff --git a/MANIFEST b/MANIFEST index aad639a..2db3c99 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,5 +1,3 @@ -# $Id: MANIFEST,v 1.35 2008-09-26 12:02:19 mike Exp $ - Changes Makefile.PL MANIFEST diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 6b38e34..6d14a32 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -1,10 +1,12 @@ -# $Id: MANIFEST.SKIP,v 1.5 2007-11-19 12:58:55 mike Exp $ - .cvsignore -CVS +.git debian lib/CVS t/CVS archive build-stamp install-stamp +IDMETA +mkdist.sh +modules +zoom-perl.spec diff --git a/Makefile.PL b/Makefile.PL index 75bfb15..2750492 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,5 +1,3 @@ -# $Id: Makefile.PL,v 1.27 2008-09-16 12:44:28 mike Exp $ - # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement" # or: perl Makefile.PL PREFIX=/home/mike/universe @@ -71,5 +69,8 @@ debian/output: rm -rf debian/output mkdir debian/output mv ../libnet-z3950-zoom-perl* debian/output + +debclean: + rm -rf debian/libnet-z3950-zoom-perl debian/output "; } diff --git a/README b/README index ae6e4e3..8415db2 100644 --- a/README +++ b/README @@ -1,5 +1,3 @@ -$Id: README,v 1.8 2008-10-02 08:33:34 mike Exp $ - The Net::Z3950::ZOOM, ZOOM and Net::Z3950 modules ================================================= diff --git a/ZOOM.xs b/ZOOM.xs index 134e94d..4e5de76 100644 --- a/ZOOM.xs +++ b/ZOOM.xs @@ -1,5 +1,3 @@ -/* $Id: ZOOM.xs,v 1.51 2008-05-14 13:31:39 mike Exp $ */ - #include "EXTERN.h" #include "perl.h" #include "XSUB.h" @@ -405,8 +403,8 @@ const char * ZOOM_scanset_term(scan, pos, occ, len) ZOOM_scanset scan size_t pos - int& occ - int& len + size_t& occ + size_t& len OUTPUT: RETVAL occ @@ -416,8 +414,8 @@ const char * ZOOM_scanset_display_term(scan, pos, occ, len) ZOOM_scanset scan size_t pos - int& occ - int& len + size_t& occ + size_t& len OUTPUT: RETVAL occ diff --git a/archive/README b/archive/README index 07f7370..bc3240d 100644 --- a/archive/README +++ b/archive/README @@ -1,5 +1,3 @@ -$Id: README,v 1.1 2008-09-26 12:22:30 mike Exp $ - This directory contains material that is not to be included in the ZOOM-Perl distribution, but which is useful to the project. diff --git a/archive/releases/Net-Z3950-ZOOM-1.26.tar.gz b/archive/releases/Net-Z3950-ZOOM-1.26.tar.gz new file mode 100644 index 0000000..b66fc25 Binary files /dev/null and b/archive/releases/Net-Z3950-ZOOM-1.26.tar.gz differ diff --git a/archive/test-server/README b/archive/test-server/README index d1bcab4..9883968 100644 --- a/archive/test-server/README +++ b/archive/test-server/README @@ -1,5 +1,3 @@ -$Id: README,v 1.2 2008-09-26 12:23:26 mike Exp $ - These files are used to run the server that the ZOOM-Perl test-suite's "packages" scripts run against. @@ -10,3 +8,23 @@ test-server.init -- script to run the test server from /etc/init.d test-server.cfg -- Zebra configuration file for the test server. test-server.pw -- password file for test server's Zebra configuration. +-- + +Over time, the Zebra database where the ZOOM-Perl package read-write +tests take place becomes bloated and unclean: when I checked on 15 +October 2010, there were over 15000 "sort-0.mf" files! As a +result, the test-suite becomes slower, to the point where +26-packages.t takes two and half minutes to run. + +When this happens, reset the database to a clean state: + +$ ssh mike@z3950.indexdata.com +$ cd ZOOM-Perl/archive/test-server +$ sudo /etc/init.d/zoom-perl-server stop +$ sudo zebraidx-2.0 -c test-server.cfg init + (This may take a few minutes!) +$ sudo /etc/init.d/zoom-perl-server start +$ exit + +Once this has been done, the time to run 26-packages.t should drop +back down to four or five seconds! diff --git a/archive/test-server/test-server.cfg b/archive/test-server/test-server.cfg index 3f2e96a..6ca6d04 100644 --- a/archive/test-server/test-server.cfg +++ b/archive/test-server/test-server.cfg @@ -1,6 +1,5 @@ # Simple Zebra configuration file -# $Id: test-server.cfg,v 1.2 2005-12-14 10:31:06 mike Exp $ -# + # Where the schema files, attribute files, etc are located. #profilePath: .:../../tab diff --git a/archive/test-server/test-server.init b/archive/test-server/test-server.init index 83f2313..5b0167a 100644 --- a/archive/test-server/test-server.init +++ b/archive/test-server/test-server.init @@ -1,7 +1,5 @@ #! /bin/sh -# $Id: test-server.init,v 1.6 2008-09-29 15:50:01 mike Exp $ -# # This is a startup/shutdown script for the ZOOM-Perl test-server, # suitable for use in a SysV-style init directory such as /etc/init.d # (on Debian systems) and /etc/rc.d/init.d (on Red Hat systems). This diff --git a/archive/test-server/test-server.notes b/archive/test-server/test-server.notes index 7b5e2b9..4f1a9b8 100644 --- a/archive/test-server/test-server.notes +++ b/archive/test-server/test-server.notes @@ -1,5 +1,3 @@ -$Id: test-server.notes,v 1.5 2008-09-26 13:38:35 mike Exp $ - To run the test-suite, this module needs an up-to-date Zebra server (as of Tue Dec 13 17:41:05 GMT 2005) running on z3950.indexdata.com port 2100, using isam:b and recognising a normal user "user" with diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index e328fad..0000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -files -libnet-z3950-zoom-perl -libnet-z3950-zoom-perl.substvars -output diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..36e5863 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,5 @@ +files +libnet-z3950-zoom-perl +libnet-z3950-zoom-perl.substvars +libnet-z3950-zoom-perl.debhelper.log +output diff --git a/debian/changelog b/debian/changelog index deba7eb..b198b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libnet-z3950-zoom-perl (1.27-1) unstable; urgency=low + + * Upstream. Changes to how packaging is done mean that this is the + first Debian release that was made from a clean tarball rather than + being built from a source checkout. + + -- Mike Taylor Wed, 11 Aug 2010 17:17:31 +0100 + +libnet-z3950-zoom-perl (1.26-1) unstable; urgency=low + + * Upstream. + + -- Mike Taylor Mon, 12 Jul 2010 17:08:37 +0100 + +libnet-z3950-zoom-perl (1.25-1) unstable; urgency=low + + * Lots of upstream goodness. + + -- Mike Taylor Fri, 19 Feb 2010 15:07:15 +0000 + libnet-z3950-zoom-perl (1.20-1) unstable; urgency=low * Add $conn->exception() method. diff --git a/debian/control b/debian/control index bfa4d6e..3e40df7 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: libnet-z3950-zoom-perl Section: perl Priority: optional -Build-Depends: debhelper (>= 5.0.0), perl (>= 5.8.8-7), libyaz3-dev +Build-Depends: debhelper (>= 5.0.0), perl (>= 5.8.8-7), libyaz3-dev, libmarc-record-perl Maintainer: Mike Taylor Standards-Version: 3.7.2 Package: libnet-z3950-zoom-perl Architecture: any -Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, +Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libmarc-record-perl Description: Perl extension implementing the ZOOM API for Information Retrieval This module provides a nice, Perlish implementation of the ZOOM Abstract API described and documented at http://zoom.z3950.org/api/ diff --git a/debian/rules b/debian/rules index 3e37596..ea16f0e 100755 --- a/debian/rules +++ b/debian/rules @@ -54,13 +54,13 @@ install-stamp: dh_clean -k # Add commands to install the package into debian/$PACKAGE_NAME here - $(MAKE) test +# $(MAKE) test ### Do not make test for now -- it's too slow $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr # As this is a architecture dependent package, we are not # supposed to install stuff to /usr/share. MakeMaker creates - # the dirs, we delete them from the deb: - rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5 + # the dirs, we delete them from the deb if they exist + rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5 || : touch install-stamp @@ -72,7 +72,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installdocs README archive/README samples/README + dh_installdocs README samples/README dh_installexamples # dh_installmenu # dh_installcron diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/lib/Net/Z3950.pm b/lib/Net/Z3950.pm index d167a4e..2f8e7d8 100644 --- a/lib/Net/Z3950.pm +++ b/lib/Net/Z3950.pm @@ -1,5 +1,3 @@ -# $Id: Z3950.pm,v 1.2 2007-02-26 15:58:33 mike Exp $ - use strict; use warnings; use Net::Z3950::ZOOM; diff --git a/lib/Net/Z3950/ZOOM.pm b/lib/Net/Z3950/ZOOM.pm index c4e64f9..29bd9b4 100644 --- a/lib/Net/Z3950/ZOOM.pm +++ b/lib/Net/Z3950/ZOOM.pm @@ -1,12 +1,10 @@ -# $Id: ZOOM.pm,v 1.42 2008-09-29 16:22:25 mike Exp $ - package Net::Z3950::ZOOM; use 5.008; use strict; use warnings; -our $VERSION = '1.25'; +our $VERSION = '1.28'; require XSLoader; XSLoader::load('Net::Z3950::ZOOM', $VERSION); diff --git a/lib/ZOOM.pm b/lib/ZOOM.pm index 8c97dae..b85163f 100644 --- a/lib/ZOOM.pm +++ b/lib/ZOOM.pm @@ -1,5 +1,3 @@ -# $Id: ZOOM.pm,v 1.50 2008-05-14 13:33:31 mike Exp $ - use strict; use warnings; use IO::File; diff --git a/lib/ZOOM.pod b/lib/ZOOM.pod index 2ea8eea..42f989e 100644 --- a/lib/ZOOM.pod +++ b/lib/ZOOM.pod @@ -1,5 +1,3 @@ -# $Id: ZOOM.pod,v 1.46 2007-12-10 21:51:40 mike Exp $ - use strict; use warnings; diff --git a/mkdist.sh b/mkdist.sh new file mode 100755 index 0000000..27280f5 --- /dev/null +++ b/mkdist.sh @@ -0,0 +1,3 @@ +echo "Projects should no longer have their own mkdist.sh script" +echo "Use the generic one in git-tools/id-deb-build/mkdist.sh" +exit 1 diff --git a/modules/README b/modules/README new file mode 100644 index 0000000..e24f07c --- /dev/null +++ b/modules/README @@ -0,0 +1,68 @@ +This directory contains Red Hat packages for Perl modules that we need +but which are not included in the standard operating-system +distribution. At present, this includes: + XML::LibXML::XPathContext + Marc::Record + HTML::TagCloud (needed for MKAdmin, not ZOOM-Perl) + +-- + +The base source RPMs were downloaded from: +ftp://ftp.pbone.net/mirror/olea.org/paquetes-rpm/perl-XML-LibXML-XPathContext-0.07-1.src.rpm +ftp://ftp.sunet.se/pub/Linux/distributions/Mandriva/devel/cooker/SRPMS/contrib/release/perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm +ftp://mirror.switch.ch/pool/2/mirror/fedora/linux/development/rawhide/source/SRPMS/perl-HTML-TagCloud-0.34-4.fc14.src.rpm +and are saved in the "orig" subdirectory. + +But they all needed tweaking for CentOS as shown in the log below: + +-- + +$ sudo rpmbuild --rebuild perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm +Installing perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm +warning: InstallSourcePackage: Header V3 DSA signature: NOKEY, key ID 26752624 +warning: user mandrake does not exist - using root +warning: group mandrake does not exist - using root +warning: user mandrake does not exist - using root +warning: group mandrake does not exist - using root +error: line 8: Tag takes single token only: Release: %mkrel 1 + +$ sudo rpmbuild --rebuild perl-XML-LibXML-XPathContext-0.07-1.src.rpm +Installing perl-XML-LibXML-XPathContext-0.07-1.src.rpm +warning: InstallSourcePackage: Header V3 DSA signature: NOKEY, key ID 41d6b379 +warning: user olea does not exist - using root +warning: group olea does not exist - using root +warning: user olea does not exist - using root +warning: group olea does not exist - using root +error: No compatible architectures found for build + +$ sudo rpmbuild --rebuild perl-HTML-TagCloud-0.34-4.fc14.src.rpm +Installing perl-HTML-TagCloud-0.34-4.fc14.src.rpm +warning: user mockbuild does not exist - using root +warning: group mockbuild does not exist - using root +error: unpacking of archive failed on file /usr/src/redhat/SOURCES/HTML-TagCloud-0.34.tar.gz;4c3c5fa4: cpio: MD5 sum mismatch +error: perl-HTML-TagCloud-0.34-4.fc14.src.rpm cannot be installed + +-- + +I couldn't find a source RPM for XML::LibXML::Simple, but I did find a +"nosrc" RPM containing a .spec file, and the actual source is easy to +get from CPAN, so I downloaded these from: +http://dist.momonga-linux.org/pub/momonga/6/Everything/SRPMS/perl-XML-LibXML-Simple-0.13-3m.mo6.nosrc.rpm +http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.13.tar.gz +extracted the .spec file from the nosrc.rpm, edited it, and built the +module using: + sudo rpmbuild -ba perl-XML-LibXML-Simple.spec +-- + +It's pretty pathetic that you need a different source RPM for each Red +Hat variant, but that seems to be the way of things. So for each +modules, I unpacked it to get hold of the .spec file that needs +editing, and the source tarball that it builds, as follows: + rpm2cpio perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm | cpio -i +And modified the extracted .spec file as necessary. The modified +.spec files are part of this git archive; the tarballs are not. + +The final binary packages, build for centos5, are in the "centos5" +directory. The build command is: + sudo rpmbuild -ba perl-MARC-Record.spec + diff --git a/modules/centos5/perl-HTML-TagCloud-0.34-4.noarch.rpm b/modules/centos5/perl-HTML-TagCloud-0.34-4.noarch.rpm new file mode 100644 index 0000000..c60d73a Binary files /dev/null and b/modules/centos5/perl-HTML-TagCloud-0.34-4.noarch.rpm differ diff --git a/modules/centos5/perl-MARC-Record-2.0.2-1.indexdata.noarch.rpm b/modules/centos5/perl-MARC-Record-2.0.2-1.indexdata.noarch.rpm new file mode 100644 index 0000000..c980307 Binary files /dev/null and b/modules/centos5/perl-MARC-Record-2.0.2-1.indexdata.noarch.rpm differ diff --git a/modules/centos5/perl-XML-LibXML-Simple-0.13-3m.noarch.rpm b/modules/centos5/perl-XML-LibXML-Simple-0.13-3m.noarch.rpm new file mode 100644 index 0000000..9b9095c Binary files /dev/null and b/modules/centos5/perl-XML-LibXML-Simple-0.13-3m.noarch.rpm differ diff --git a/modules/centos5/perl-XML-LibXML-XPathContext-0.07-1.x86_64.rpm b/modules/centos5/perl-XML-LibXML-XPathContext-0.07-1.x86_64.rpm new file mode 100644 index 0000000..231c928 Binary files /dev/null and b/modules/centos5/perl-XML-LibXML-XPathContext-0.07-1.x86_64.rpm differ diff --git a/modules/orig/.gitignore b/modules/orig/.gitignore new file mode 100644 index 0000000..9166719 --- /dev/null +++ b/modules/orig/.gitignore @@ -0,0 +1,3 @@ +HTML-TagCloud-0.34.tar.gz +MARC-Record-2.0.2.tar.gz +XML-LibXML-XPathContext-0.07.tar.gz diff --git a/modules/orig/XML-LibXML-Simple-0.13.tar.gz b/modules/orig/XML-LibXML-Simple-0.13.tar.gz new file mode 100644 index 0000000..e964e0b Binary files /dev/null and b/modules/orig/XML-LibXML-Simple-0.13.tar.gz differ diff --git a/modules/orig/XML-LibXML-XPathContext.spec b/modules/orig/XML-LibXML-XPathContext.spec new file mode 100644 index 0000000..1f8cb36 --- /dev/null +++ b/modules/orig/XML-LibXML-XPathContext.spec @@ -0,0 +1,148 @@ +# +# - XML::LibXML::XPathContext - +# This spec file was automatically generated by cpan2rpm [ver: 2.028] +# The following arguments were used: +# XML::LibXML::XPathContext XML::XUpdate::LibXML +# For more information on cpan2rpm please visit: http://perl.arix.com/ +# + +%define pkgname XML-LibXML-XPathContext +%define filelist %{pkgname}-%{version}-filelist +%define NVR %{pkgname}-%{version}-%{release} +%define maketest 1 + +name: perl-XML-LibXML-XPathContext +summary: XML-LibXML-XPathContext - Perl interface to libxml2's xmlXPathContext +version: 0.07 +release: 1 +vendor: Based on LXMLLibXMLXMLLibXML <> +packager: Arix International +license: Artistic +group: Applications/CPAN +url: http://www.cpan.org +buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n) +#buildarch: i686 +prefix: %(echo %{_prefix}) +source: XML-LibXML-XPathContext-0.07.tar.gz + +%description +This module augments XML::LibXML by providing Perl +interface to libxml2's xmlXPathContext structure. Besides just +performing xpath statements on XML::LibXML's node trees +it allows redefining certaint aspects of XPath engine. This modules +allows + +=over 4 + +=item 1 + +registering namespace prefixes, + +=item 2 + +defining XPath functions in Perl, + +=item 3 + +defining variable lookup functions in Perl. + +=item 3 + +cheating the context about current proximity position and context size + +=back + +# +# This package was generated automatically with the cpan2rpm +# utility. To get this software or for more information +# please visit: http://perl.arix.com/ +# + +%prep +%setup -q -n %{pkgname}-%{version} +chmod -R u+w %{_builddir}/%{pkgname}-%{version} + +%build +grep -rsl '^#!.*perl' . | +grep -v '.bak$' |xargs --no-run-if-empty \ +%__perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' +CFLAGS="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL `%{__perl} -MExtUtils::MakeMaker -e ' print qq|PREFIX=%{buildroot}%{_prefix}| if \$ExtUtils::MakeMaker::VERSION =~ /5\.9[1-6]|6\.0[0-5]/ '` +%{__make} +%if %maketest +%{__make} test +%endif + +%install +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} + +%{makeinstall} `%{__perl} -MExtUtils::MakeMaker -e ' print \$ExtUtils::MakeMaker::VERSION <= 6.05 ? qq|PREFIX=%{buildroot}%{_prefix}| : qq|DESTDIR=%{buildroot}| '` + +cmd=/usr/share/spec-helper/compress_files +[ -x $cmd ] || cmd=/usr/lib/rpm/brp-compress +[ -x $cmd ] && $cmd + +# SuSE Linux +if [ -e /etc/SuSE-release -o -e /etc/UnitedLinux-release ] +then + %{__mkdir_p} %{buildroot}/var/adm/perl-modules + %{__cat} `find %{buildroot} -name "perllocal.pod"` \ + | %{__sed} -e s+%{buildroot}++g \ + > %{buildroot}/var/adm/perl-modules/%{name} +fi + +# remove special files +find %{buildroot} -name "perllocal.pod" \ + -o -name ".packlist" \ + -o -name "*.bs" \ + |xargs -i rm -f {} + +# no empty directories +find %{buildroot}%{_prefix} \ + -type d -depth \ + -exec rmdir {} \; 2>/dev/null + +%{__perl} -MFile::Find -le ' + find({ wanted => \&wanted, no_chdir => 1}, "%{buildroot}"); + print "%doc Changes README LICENSE"; + for my $x (sort @dirs, @files) { + push @ret, $x unless indirs($x); + } + print join "\n", sort @ret; + + sub wanted { + return if /auto$/; + + local $_ = $File::Find::name; + my $f = $_; s|^\Q%{buildroot}\E||; + return unless length; + return $files[@files] = $_ if -f $f; + + $d = $_; + /\Q$d\E/ && return for reverse sort @INC; + $d =~ /\Q$_\E/ && return + for qw|/etc %_prefix/man %_prefix/bin %_prefix/share|; + + $dirs[@dirs] = $_; + } + + sub indirs { + my $x = shift; + $x =~ /^\Q$_\E\// && $x ne $_ && return 1 for @dirs; + } + ' > %filelist + +[ -z %filelist ] && { + echo "ERROR: empty %files listing" + exit -1 + } + +%clean +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} + +%files -f %filelist +%defattr(-,root,root) + +%changelog +* Tue Jan 2 2007 olea@lisergia +- Initial build. \ No newline at end of file diff --git a/modules/orig/perl-HTML-TagCloud-0.34-4.fc14.src.rpm b/modules/orig/perl-HTML-TagCloud-0.34-4.fc14.src.rpm new file mode 100644 index 0000000..05b52bb Binary files /dev/null and b/modules/orig/perl-HTML-TagCloud-0.34-4.fc14.src.rpm differ diff --git a/modules/orig/perl-HTML-TagCloud.spec b/modules/orig/perl-HTML-TagCloud.spec new file mode 100644 index 0000000..4314b1d --- /dev/null +++ b/modules/orig/perl-HTML-TagCloud.spec @@ -0,0 +1,76 @@ +Name: perl-HTML-TagCloud +Version: 0.34 +Release: 4%{?dist} +# lib/HTML/TagCloud.pm -> GPL+ or Artistic +License: GPL+ or Artistic +Group: Development/Libraries +Summary: Generate An HTML Tag Cloud +Source: HTML-TagCloud-%{version}.tar.gz +Url: http://search.cpan.org/dist/HTML-TagCloud +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildArch: noarch + +BuildRequires: perl(ExtUtils::MakeMaker) +#BuildRequires: perl(Module::Build::Compat) +BuildRequires: perl(Test::More) +# optional tests +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) + +%description +The HTML::TagCloud module enables you to generate "tag clouds" in HTML. Tag +clouds serve as a textual way to visualize terms and topics that are used +most frequently. The tags are sorted alphabetically and a larger font is +used to indicate more frequent term usage. + +This module provides a simple interface to generating a CSS-based HTML tag +cloud. You simply pass in a set of tags, their URL and their count. This +module outputs stylesheet-based HTML. You may use the included CSS or use +your own. + +%prep +%setup -q -n HTML-TagCloud-%{version} + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' + +%{_fixperms} %{buildroot}/* + +%check +make test + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc CHANGES README +%{perl_vendorlib}/* +%{_mandir}/man3/*.3* + +%changelog +* Sun May 02 2010 Marcela Maslanova - 0.34-4 +- Mass rebuild with perl-5.12.0 + +* Mon Dec 7 2009 Stepan Kasal - 0.34-3 +- rebuild against perl 5.10.1 + +* Sat Jul 25 2009 Fedora Release Engineering - 0.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Mar 03 2009 Chris Weyl 0.34-1 +- submission + +* Tue Mar 03 2009 Chris Weyl 0.34-0 +- initial RPM packaging +- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) + diff --git a/modules/orig/perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm b/modules/orig/perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm new file mode 100644 index 0000000..65bc928 Binary files /dev/null and b/modules/orig/perl-MARC-Record-2.0.2-1mdv2010.1.src.rpm differ diff --git a/modules/orig/perl-MARC-Record.spec b/modules/orig/perl-MARC-Record.spec new file mode 100644 index 0000000..c2cabcd --- /dev/null +++ b/modules/orig/perl-MARC-Record.spec @@ -0,0 +1,91 @@ +%define module MARC-Record +%define name perl-%{module} +%define version 2.0.2 +%define release 1.indexdata + +Name: %{name} +Version: %{version} +Release: %{release} +Summary: %{module} module for perl +License: GPLv2+ or Artistic +Group: Development/Perl +Source: %{module}-%{version}.tar.gz +Url: http://search.cpan.org/dist/%{module}/ + +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-root + +%description +Module for handling MARC records as objects. +The file-handling stuff is in MARC::File::*. + +%prep +%setup -q -n %{module}-%{version} + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=$RPM_BUILD_ROOT/usr +%{__make} + +%check +%{__make} test + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +#chmod 644 $RPM_BUILD_ROOT/%{perl_vendorlib}/MARC/Record.pm +#chmod 644 $RPM_BUILD_ROOT/%{perl_vendorlib}/MARC/Field.pm +rm $RPM_BUILD_ROOT/usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/perllocal.pod +rm $RPM_BUILD_ROOT/usr/lib64/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi/auto/MARC/Record/.packlist + +%files +%defattr(-,root,root) +%{_bindir}/marcdump +%doc Changes README +%{perl_vendorlib}/MARC +%{_mandir}/*/* + + + + +%changelog +* Fri May 07 2010 Stéphane Téletchéa 2.0.2-1mdv2010.1 ++ Revision: 543146 +- Update to 2.0.2 + +* Fri Sep 04 2009 Thierry Vignaud 2.0.0-5mdv2010.0 ++ Revision: 430498 +- rebuild + +* Thu Jul 31 2008 Thierry Vignaud 2.0.0-4mdv2009.0 ++ Revision: 257751 +- rebuild + +* Thu Jul 24 2008 Thierry Vignaud 2.0.0-3mdv2009.0 ++ Revision: 245821 +- rebuild + +* Wed Jan 02 2008 Olivier Blin 2.0.0-1mdv2008.1 ++ Revision: 140691 +- restore BuildRoot + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + + +* Wed Feb 14 2007 Stéphane Téletchéa 2.0.0-1mdv2007.0 ++ Revision: 120948 +- Update to 2.0.0 +- MARC::Lint is now in a separate module +- Import perl-MARC-Record + +* Thu May 04 2006 Nicolas Lécureuil 1.38-2mdk +- Fix According to perl Policy + - Source URL + +* Thu May 04 2006 Jerome Soyer 1.38-1mdk +- From Stéphane Téletchéa +- Initial Mandriva release + diff --git a/modules/orig/perl-XML-LibXML-Simple-0.13-3m.mo6.nosrc.rpm b/modules/orig/perl-XML-LibXML-Simple-0.13-3m.mo6.nosrc.rpm new file mode 100644 index 0000000..7327b22 Binary files /dev/null and b/modules/orig/perl-XML-LibXML-Simple-0.13-3m.mo6.nosrc.rpm differ diff --git a/modules/orig/perl-XML-LibXML-Simple.spec b/modules/orig/perl-XML-LibXML-Simple.spec new file mode 100644 index 0000000..54d2416 --- /dev/null +++ b/modules/orig/perl-XML-LibXML-Simple.spec @@ -0,0 +1,70 @@ +%global momorel 3 + +Name: perl-XML-LibXML-Simple +Version: 0.13 +Release: %{momorel}m%{?dist} +Summary: XML::LibXML clone of XML::Simple::XMLin() +License: GPL+ or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/XML-LibXML-Simple/ +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/XML-LibXML-Simple-%{version}.tar.gz +NoSource: 0 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +#BuildRequires: perl-ExtUtils-MakeMaker +BuildRequires: perl-File-Slurp +#BuildRequires: perl-Test-Simple +BuildRequires: perl-Test-Pod >= 1.00 +BuildRequires: perl-XML-LibXML >= 1.58 +Requires: perl(File::Slurp) +Requires: perl(Test::More) >= 0.54 +Requires: perl(Test::Pod) >= 1.00 +Requires: perl(XML::LibXML) >= 1.58 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description +This module is a blunt rewrite of XML::Simple (by Grant McLean) to use the +XML::LibXML parser for XML structures, where the original uses plain Perl +or SAX parsers. + +%prep +%setup -q -n XML-LibXML-Simple-%{version} + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make pure_install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; + +chmod -R u+rwX,go+rX,go-w %{buildroot}/* + +%check +make test + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc ChangeLog README +%{perl_vendorlib}/XML/LibXML/Simple* +%{_mandir}/man3/* + +%changelog +* Tue Jun 2 2009 NAKAYA Toshiharu +- (0.13-3m) +- remove duplicate directories + +* Mon Jun 01 2009 NAKAYA Toshiharu +- (0.13-2m) +- modify BuildRequires + +* Sat May 30 2009 Nakamura Hirotaka +- (0.13-1m) +- Specfile autogenerated by cpanspec 1.78 for Momonga Linux. diff --git a/modules/orig/perl-XML-LibXML-XPathContext-0.07-1.src.rpm b/modules/orig/perl-XML-LibXML-XPathContext-0.07-1.src.rpm new file mode 100644 index 0000000..ef2eb67 Binary files /dev/null and b/modules/orig/perl-XML-LibXML-XPathContext-0.07-1.src.rpm differ diff --git a/samples/README b/samples/README index a1e3f88..df6d413 100644 --- a/samples/README +++ b/samples/README @@ -1,5 +1,3 @@ -$Id: README,v 1.6 2006-04-07 13:06:13 mike Exp $ - This area contains sample programs that exercise all three of the APIs supported by this module. The programs for each API are contained in separate subdirectories: diff --git a/samples/ccl/default.bib b/samples/ccl/default.bib index 978d71d..b0f069d 100644 --- a/samples/ccl/default.bib +++ b/samples/ccl/default.bib @@ -1,5 +1,4 @@ # CCL field mappings -# $Id: default.bib,v 1.1 2006-06-13 16:44:21 mike Exp $ # # The rule below is used when no fields are specified term t=l,r s=al diff --git a/samples/cql/pqf.properties b/samples/cql/pqf.properties index 80e5057..2a9d764 100644 --- a/samples/cql/pqf.properties +++ b/samples/cql/pqf.properties @@ -1,5 +1,3 @@ -# $Id: pqf.properties,v 1.1 2005-12-21 00:16:31 mike Exp $ -# # Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF() # back-end and the YAZ CQL-to-PQF converter. This specifies the # interpretation of various CQL indexes, relations, etc. in terms diff --git a/samples/net-z3950-zoom/async.pl b/samples/net-z3950-zoom/async.pl index 3e55859..08e0800 100644 --- a/samples/net-z3950-zoom/async.pl +++ b/samples/net-z3950-zoom/async.pl @@ -1,5 +1,3 @@ -# $Id: async.pl,v 1.4 2008-05-14 13:34:00 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: diff --git a/samples/net-z3950-zoom/zoomtst1.pl b/samples/net-z3950-zoom/zoomtst1.pl index bbb7841..ccdd925 100644 --- a/samples/net-z3950-zoom/zoomtst1.pl +++ b/samples/net-z3950-zoom/zoomtst1.pl @@ -1,5 +1,3 @@ -# $Id: zoomtst1.pl,v 1.4 2008-05-14 13:34:00 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl diff --git a/samples/net-z3950-zoom/zoomtst3.pl b/samples/net-z3950-zoom/zoomtst3.pl index 0525251..140e5f0 100644 --- a/samples/net-z3950-zoom/zoomtst3.pl +++ b/samples/net-z3950-zoom/zoomtst3.pl @@ -1,5 +1,3 @@ -# $Id: zoomtst3.pl,v 1.9 2008-05-14 13:34:00 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: diff --git a/samples/net-z3950/zoomtst1.pl b/samples/net-z3950/zoomtst1.pl index 86c75af..ca96b29 100644 --- a/samples/net-z3950/zoomtst1.pl +++ b/samples/net-z3950/zoomtst1.pl @@ -1,5 +1,3 @@ -# $Id: zoomtst1.pl,v 1.4 2006-11-02 17:48:25 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl diff --git a/samples/zoom/async.pl b/samples/zoom/async.pl index ac3e5f9..6304835 100644 --- a/samples/zoom/async.pl +++ b/samples/zoom/async.pl @@ -1,5 +1,3 @@ -# $Id: async.pl,v 1.2 2006-11-02 17:48:26 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch async.pl [...] # for example: diff --git a/samples/zoom/update.pl b/samples/zoom/update.pl index c44cd20..0b9fd87 100755 --- a/samples/zoom/update.pl +++ b/samples/zoom/update.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: update.pl,v 1.1 2006-06-05 16:33:42 mike Exp $ - use strict; use warnings; use ZOOM; diff --git a/samples/zoom/zhello.pl b/samples/zoom/zhello.pl index d79c404..8c70426 100755 --- a/samples/zoom/zhello.pl +++ b/samples/zoom/zhello.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: zhello.pl,v 1.1 2006-12-06 11:16:26 mike Exp $ - use strict; use warnings; use ZOOM; diff --git a/samples/zoom/zoomdump b/samples/zoom/zoomdump index c4fd65d..26a9893 100755 --- a/samples/zoom/zoomdump +++ b/samples/zoom/zoomdump @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: zoomdump,v 1.2 2007-03-07 11:34:26 mike Exp $ -# # Dumps the contents of the nominated Zebra database to a set of # separate XML files with numeric names. diff --git a/samples/zoom/zoomscan.pl b/samples/zoom/zoomscan.pl index 7b86946..b18c9d7 100644 --- a/samples/zoom/zoomscan.pl +++ b/samples/zoom/zoomscan.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: zoomscan.pl,v 1.5 2008-05-14 13:27:32 mike Exp $ -# # This is the scanning counterpart to zoomscan.pl's searching # perl -I../../blib/lib -I../../blib/arch zoomscan.pl # diff --git a/samples/zoom/zoomtst1.pl b/samples/zoom/zoomtst1.pl index d40903f..6221488 100644 --- a/samples/zoom/zoomtst1.pl +++ b/samples/zoom/zoomtst1.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: zoomtst1.pl,v 1.6 2007-08-17 18:35:17 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl diff --git a/samples/zoom/zoomtst3.pl b/samples/zoom/zoomtst3.pl index eb72ed0..91c00be 100644 --- a/samples/zoom/zoomtst3.pl +++ b/samples/zoom/zoomtst3.pl @@ -1,5 +1,3 @@ -# $Id: zoomtst3.pl,v 1.6 2006-11-02 17:48:26 mike Exp $ -# # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: diff --git a/samples/zoom/zselect b/samples/zoom/zselect index 8ff754b..14d0b45 100755 --- a/samples/zoom/zselect +++ b/samples/zoom/zselect @@ -1,7 +1,5 @@ #!/usr/bin/perl -w -# $Id: zselect,v 1.3 2007-04-18 11:18:08 mike Exp $ - # Example command-line: # ./zselect -t q localhost:3313/IR-Explain---1 "net.port=3950" "concat(zeerex:serverInfo/zeerex:host, ':', zeerex:serverInfo/zeerex:port, '/', zeerex:serverInfo/zeerex:database)" diff --git a/t/1-Net-Z3950-ZOOM.t b/t/1-Net-Z3950-ZOOM.t index d530145..a23ba48 100644 --- a/t/1-Net-Z3950-ZOOM.t +++ b/t/1-Net-Z3950-ZOOM.t @@ -1,5 +1,3 @@ -# $Id: 1-Net-Z3950-ZOOM.t,v 1.17 2008-05-14 13:32:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 1-Net-Z3950-ZOOM.t' @@ -19,8 +17,10 @@ my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); my $host = "no.such.host"; my $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); -ok($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host, - "connection to non-existent host '$host' fails"); +# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT +ok(($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host) || + ($errcode == Net::Z3950::ZOOM::ERROR_TIMEOUT && $addinfo eq ""), + "connection to non-existent host '$host' fails: errcode=$errcode, addinfo=$addinfo"); $host = "z3950.indexdata.com/gils"; $conn = Net::Z3950::ZOOM::connection_new($host, 0); diff --git a/t/10-options.t b/t/10-options.t index 9a86349..bf685bf 100644 --- a/t/10-options.t +++ b/t/10-options.t @@ -1,5 +1,3 @@ -# $Id: 10-options.t,v 1.1 2005-10-18 17:01:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 10-options.t' diff --git a/t/11-option-callback.t b/t/11-option-callback.t index ae8e488..7e0617f 100644 --- a/t/11-option-callback.t +++ b/t/11-option-callback.t @@ -1,5 +1,3 @@ -# $Id: 11-option-callback.t,v 1.2 2005-10-19 15:14:26 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 11-option-callback.t' diff --git a/t/12-query.t b/t/12-query.t index 768c27e..d21204b 100644 --- a/t/12-query.t +++ b/t/12-query.t @@ -1,5 +1,3 @@ -# $Id: 12-query.t,v 1.11 2008-05-14 13:32:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 12-query.t' diff --git a/t/13-resultset.t b/t/13-resultset.t index 73d8e06..b3e6225 100644 --- a/t/13-resultset.t +++ b/t/13-resultset.t @@ -1,5 +1,3 @@ -# $Id: 13-resultset.t,v 1.10 2008-05-14 13:32:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 13-resultset.t' diff --git a/t/14-sorting.t b/t/14-sorting.t index 7b13815..341ed44 100644 --- a/t/14-sorting.t +++ b/t/14-sorting.t @@ -1,5 +1,3 @@ -# $Id: 14-sorting.t,v 1.9 2008-05-14 13:32:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 14-sorting.t' diff --git a/t/15-scan.t b/t/15-scan.t index f894513..fea22a0 100644 --- a/t/15-scan.t +++ b/t/15-scan.t @@ -1,11 +1,9 @@ -# $Id: 15-scan.t,v 1.14 2007-08-16 17:19:35 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 15-scan.t' use strict; use warnings; -use Test::More tests => 87; +use Test::More tests => 81; BEGIN { use_ok('Net::Z3950::ZOOM') }; @@ -16,6 +14,7 @@ my $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == 0, "connection to '$host'"); +Net::Z3950::ZOOM::connection_option_set($conn, number => 10); my($ss, $n) = scan($conn, 0, "w", 10); my @terms = (); @@ -32,7 +31,8 @@ foreach my $i (1 .. $n) { my $disp = Net::Z3950::ZOOM::scanset_display_term($ss, $i-1, $occ, $len); ok(defined $disp && $len eq length($disp), "display term $i of $n: '$disp' ($occ occurences)"); - ok($disp eq $term, "display term $i identical to term"); + ok(lc($disp) eq lc($term), + "display term $i ($disp) equivalent to term ($term)"); } Net::Z3950::ZOOM::scanset_destroy($ss); @@ -52,7 +52,8 @@ foreach my $i (1 .. $n) { "got title term $i of $n: '$term' ($occ occurences)"); ok($term ge $previous, "title term '$term' ge previous '$previous'"); $previous = $term; - ok((grep { $term eq $_ } @terms), "title term was in term list"); + # See comment in 25-scan.t + #ok((grep { $term eq $_ } @terms), "title term ($term) was in term list (@terms)"); } Net::Z3950::ZOOM::scanset_destroy($ss); @@ -127,6 +128,6 @@ sub scan { my $n = Net::Z3950::ZOOM::scanset_size($ss); ok(defined $n, "got size"); - ok($n == $nexpected, "got $n terms (expected $nexpected)"); + ok($n == $nexpected, "got $n terms '$startterm' (expected $nexpected)"); return ($ss, $n); } diff --git a/t/16-packages.t b/t/16-packages.t index 5f3e3f7..1cdd022 100644 --- a/t/16-packages.t +++ b/t/16-packages.t @@ -1,5 +1,3 @@ -# $Id: 16-packages.t,v 1.14 2008-09-29 15:49:13 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 16-packages.t' diff --git a/t/17-logging.t b/t/17-logging.t index b6477bd..3ca43b5 100644 --- a/t/17-logging.t +++ b/t/17-logging.t @@ -1,5 +1,3 @@ -# $Id: 17-logging.t,v 1.4 2005-12-22 12:52:45 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 17-logging.t' diff --git a/t/18-charset.t b/t/18-charset.t index 3971474..72e0ead 100644 --- a/t/18-charset.t +++ b/t/18-charset.t @@ -1,5 +1,3 @@ -# $Id: 18-charset.t,v 1.2 2008-05-14 13:32:55 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 18-charset.t' diff --git a/t/19-events.t b/t/19-events.t index e104f3d..3c286b2 100644 --- a/t/19-events.t +++ b/t/19-events.t @@ -1,5 +1,3 @@ -# $Id: 19-events.t,v 1.8 2007-02-22 20:38:11 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 19-events.t' diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t index 9ab96ee..d644068 100644 --- a/t/2-ZOOM.t +++ b/t/2-ZOOM.t @@ -1,5 +1,3 @@ -# $Id: 2-ZOOM.t,v 1.13 2007-09-14 10:36:13 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 2-ZOOM.t' @@ -17,9 +15,11 @@ ok($msg eq "Empty term unsupported", "SRW diagnostic string lookup works"); my $host = "no.such.host"; my $conn; eval { $conn = new ZOOM::Connection($host, 0) }; +# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT ok($@ && $@->isa("ZOOM::Exception") && - $@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host, - "connection to non-existent host '$host' fails"); + (($@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host) || + ($@->code() == ZOOM::Error::TIMEOUT && $@->addinfo() eq "")), + "connection to non-existent host '$host' fails: \$\@=$@"); $host = "z3950.indexdata.com/gils"; eval { $conn = new ZOOM::Connection($host, 0) }; diff --git a/t/20-options.t b/t/20-options.t index e42a283..21f1b04 100644 --- a/t/20-options.t +++ b/t/20-options.t @@ -1,5 +1,3 @@ -# $Id: 20-options.t,v 1.1 2005-10-19 13:53:47 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 20-options.t' diff --git a/t/21-option-callback.t b/t/21-option-callback.t index 5eb94af..5cfaeb8 100644 --- a/t/21-option-callback.t +++ b/t/21-option-callback.t @@ -1,5 +1,3 @@ -# $Id: 21-option-callback.t,v 1.1 2005-10-24 16:42:31 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 21-option-calback.t' diff --git a/t/22-query.t b/t/22-query.t index 5da0ceb..4ffbd63 100644 --- a/t/22-query.t +++ b/t/22-query.t @@ -1,5 +1,3 @@ -# $Id: 22-query.t,v 1.11 2006-11-02 17:48:26 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 22-query.t' diff --git a/t/23-resultset.t b/t/23-resultset.t index 87c4bac..7a026ff 100644 --- a/t/23-resultset.t +++ b/t/23-resultset.t @@ -1,5 +1,3 @@ -# $Id: 23-resultset.t,v 1.6 2006-11-28 16:47:19 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 23-resultset.t' diff --git a/t/24-sorting.t b/t/24-sorting.t index c3e7cf3..e7f1b77 100644 --- a/t/24-sorting.t +++ b/t/24-sorting.t @@ -1,5 +1,3 @@ -# $Id: 24-sorting.t,v 1.7 2006-11-02 17:48:26 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 24-sorting.t' diff --git a/t/25-scan.t b/t/25-scan.t index a6da292..01aba9e 100644 --- a/t/25-scan.t +++ b/t/25-scan.t @@ -1,11 +1,9 @@ -# $Id: 25-scan.t,v 1.11 2007-08-16 17:19:35 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 25-scan.t' use strict; use warnings; -use Test::More tests => 87; +use Test::More tests => 81; BEGIN { use_ok('ZOOM') }; @@ -14,6 +12,7 @@ my $conn; eval { $conn = new ZOOM::Connection($host, 0) }; ok(!$@, "connection to '$host'"); +$conn->option(number => 10); my($ss, $n) = scan($conn, 0, "w", 10); my @terms = (); @@ -29,7 +28,8 @@ foreach my $i (1 .. $n) { (my $disp, $occ) = $ss->display_term($i-1); ok(defined $disp, "display term $i of $n: '$disp' ($occ occurences)"); - ok($disp eq $term, "display term $i identical to term"); + ok(lc($disp) eq lc($term), + "display term $i ($disp) equivalent to term ($term)"); } $ss->destroy(); @@ -49,7 +49,14 @@ foreach my $i (1 .. $n) { "got title term $i of $n: '$term' ($occ occurences)"); ok($term ge $previous, "title term '$term' ge previous '$previous'"); $previous = $term; - ok((grep { $term eq $_ } @terms), "title term was in term list"); + + # Previously we used to assert that the each title-term was + # included in the initial term-list that we got by scanning across + # all indexes. Of course this will not in general be true, + # because not all terms are title terms, which means that the $n + # title terms will include some that are past the end of $n + # general terms. So remove that test. + #ok((grep { $term eq $_ } @terms), "title term ($term) was in term list (@terms)"); } $ss->destroy(); @@ -115,6 +122,6 @@ sub scan { my $n = $ss->size(); ok(defined $n, "got size"); - ok($n == $nexpected, "got $n terms (expected $nexpected)"); + ok($n == $nexpected, "got $n terms for '$startterm' (expected $nexpected)"); return ($ss, $n); } diff --git a/t/26-packages.t b/t/26-packages.t index 318225c..e60b5f3 100644 --- a/t/26-packages.t +++ b/t/26-packages.t @@ -1,5 +1,3 @@ -# $Id: 26-packages.t,v 1.9 2008-09-29 15:49:18 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 26-packages.t' diff --git a/t/27-logging.t b/t/27-logging.t index 4415126..2dfba09 100644 --- a/t/27-logging.t +++ b/t/27-logging.t @@ -1,5 +1,3 @@ -# $Id: 27-logging.t,v 1.2 2007-02-26 14:56:26 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 27-logging.t' diff --git a/t/28-charset.t b/t/28-charset.t index 8e717fe..16773f0 100644 --- a/t/28-charset.t +++ b/t/28-charset.t @@ -1,5 +1,3 @@ -# $Id: 28-charset.t,v 1.2 2006-04-06 08:15:43 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 28-charset.t' diff --git a/t/29-events.t b/t/29-events.t index c8e851e..5c0ef4b 100644 --- a/t/29-events.t +++ b/t/29-events.t @@ -1,5 +1,3 @@ -# $Id: 29-events.t,v 1.4 2006-11-02 17:48:26 mike Exp $ - # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 19-events.t' diff --git a/typemap b/typemap index 2523a37..7bd56b6 100644 --- a/typemap +++ b/typemap @@ -1,5 +1,3 @@ -# $Id: typemap,v 1.8 2007-10-29 11:50:49 mike Exp $ - ZOOM_connection T_PTROBJ ZOOM_connection * T_PTROBJ ZOOM_options T_PTROBJ diff --git a/zoom-perl.spec b/zoom-perl.spec new file mode 100644 index 0000000..da472dc --- /dev/null +++ b/zoom-perl.spec @@ -0,0 +1,73 @@ +Summary: Perl implementation of the ZOOM abstract API +Name: libnet-z3950-zoom-perl +Version: 1.27 +Release: 1.indexdata +License: Perl +Group: Applications/Internet +Vendor: Index Data ApS +Source: libnet-z3950-zoom-perl-%{version}.tar.gz +BuildRoot: %{_tmppath}/libnet-z3950-zoom-perl-%{version}-root +BuildRequires: perl +Packager: Mike Taylor +URL: http://www.indexdata.com/masterkey/ + +Requires: libyaz4-devel +Requires: perl-MARC-Record +Requires: perl-XML-LibXML +Requires: perl-XML-LibXML-XPathContext + +%description +This module provides a nice, Perlish implementation of the ZOOM +Abstract API described and documented at http://zoom.z3950.org/api/ + +the ZOOM module is implemented as a set of thin classes on top of the +non-OO functions provided by this distribution's Net::Z3950::ZOOM +module, which in turn is a thin layer on top of the ZOOM-C code +supplied as part of Index Data's YAZ Toolkit. Because ZOOM-C is also +the underlying code that implements ZOOM bindings in C++, Visual +Basic, Scheme, Ruby, .NET (including C#) and other languages, this +Perl module works compatibly with those other implementations. (Of +course, the point of a public API such as ZOOM is that all +implementations should be compatible anyway; but knowing that the same +code is running is reassuring.) + +%prep +%setup + +%build +perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr +make + +%install +make install +rm $RPM_BUILD_ROOT/usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/perllocal.pod +# Perl's make install seems to create both uncompressed AND compressed +# versions of the manual pages, which confuses /usr/lib/rpm/brp-compress +find $RPM_BUILD_ROOT/usr/share/man -name '*.gz' -exec rm -f '{}' \; + +# Install documentation +DOCDIR=$RPM_BUILD_ROOT%{_datadir}/doc/perl-zoom +mkdir -p $DOCDIR +cp -p README Changes $DOCDIR/ + +%clean +rm -fr ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc %{_datadir}/doc/perl-zoom +%{_bindir}/zselect +%{_bindir}/zoomdump +/usr/lib64/perl5/site_perl/5.8.8 +%doc %{_datadir}/man/man3/Net::Z3950::ZOOM.3pm.gz +%doc %{_datadir}/man/man3/ZOOM.3pm.gz + +# Why is this file in such a silly location? This is fragile. +#/usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/auto/Masterkey/Admin/.packlist + +%changelog +* Mon Jul 12 2010 Mike Taylor +- First Red Hat packaged version. + +All versions follow the upstream changelog "Changes". +