X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom-perl.spec;h=cf616fc8cc516bd471f610eb42e808fbe7be0bd4;hb=eb9ae2e0469870dc0766688e83db55ed598cd20f;hp=da472dcbabe12d04aa3b62a072be491ec4e5fe8c;hpb=ed54987ad1fb0fb1051124dc809e995d43cbbe35;p=ZOOM-Perl-moved-to-github.git

diff --git a/zoom-perl.spec b/zoom-perl.spec
index da472dc..cf616fc 100644
--- a/zoom-perl.spec
+++ b/zoom-perl.spec
@@ -8,10 +8,11 @@ Vendor: Index Data ApS <info@indexdata.com>
 Source: libnet-z3950-zoom-perl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/libnet-z3950-zoom-perl-%{version}-root
 BuildRequires: perl
+BuildRequires: libyaz4-devel
 Packager: Mike Taylor <mike@indexdata.com>
 URL: http://www.indexdata.com/masterkey/
 
-Requires: libyaz4-devel
+Requires: libyaz4
 Requires: perl-MARC-Record
 Requires: perl-XML-LibXML
 Requires: perl-XML-LibXML-XPathContext
@@ -35,12 +36,13 @@ code is running is reassuring.)
 %setup
 
 %build
-perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr
-make
+%{__perl} Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
+%{__make}
 
 %install
-make install
-rm $RPM_BUILD_ROOT/usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/perllocal.pod
+%{__rm} -rf %{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot}
+
 # 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 '{}' \;
@@ -58,12 +60,9 @@ rm -fr ${RPM_BUILD_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
+%{perl_vendorarch}
 
 %changelog
 * Mon Jul 12 2010 Mike Taylor <mike@indexdata.com>