rpms/perl-String-ShellQuote/devel perl-String-ShellQuote.spec, 1.5, 1.6

Ville Skytta (scop) fedora-extras-commits at redhat.com
Thu Dec 16 19:31:34 UTC 2004


Author: scop

Update of /cvs/extras/rpms/perl-String-ShellQuote/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11946

Modified Files:
	perl-String-ShellQuote.spec 
Log Message:
Sync with fedora-rpmdevtools' Perl spec template to fix x86_64 build.


Index: perl-String-ShellQuote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-ShellQuote/devel/perl-String-ShellQuote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-String-ShellQuote.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perl-String-ShellQuote.spec	16 Dec 2004 19:31:32 -0000	1.6
@@ -1,17 +1,20 @@
+%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:           perl-String-ShellQuote
 Version:        1.00
-Release:        7
+Release:        8
 Epoch:          0
 Summary:        Perl module for quoting strings for passing through the shell
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/String-ShellQuote/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://www.cpan.org/authors/id/R/RO/ROSCH/String-ShellQuote-1.00.tar.gz
-BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module contains some functions which are useful for quoting
@@ -24,22 +27,22 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-make OPTIMIZE="$RPM_OPT_FLAGS"
-make test
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
+%check || :
+make test
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,11 +50,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{_libdir}/perl*/*
-%{_mandir}/man*/*
+%{perl_vendorlib}/String
+%{_mandir}/man3/String::ShellQuote.3*
 
 
 %changelog
+* Thu Dec 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.00-8
+- Sync with fedora-rpmdevtools' Perl spec template to fix x86_64 build.
+
 * Thu Sep 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.00-0.fdr.7
 - Specfile cleanup, using INSTALLDIRS=vendor, PERL_INSTALL_ROOT and
   INSTALLARCHLIB.




More information about the scm-commits mailing list