rpms/perl-XML-XQL/EL-5 XML-XQL-filter-provides.sh, NONE, 1.1 perl-XML-XQL.spec, 1.4, 1.5

Steven Pritchard steve at fedoraproject.org
Mon Dec 10 17:10:15 UTC 2007


Author: steve

Update of /cvs/pkgs/rpms/perl-XML-XQL/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23114

Modified Files:
	perl-XML-XQL.spec 
Added Files:
	XML-XQL-filter-provides.sh 
Log Message:
Sync with devel.


--- NEW FILE XML-XQL-filter-provides.sh ---
#!/bin/sh

# Remove unversioned XML::XQL and bogus XML::DOM provides.
@@PERL_PROV@@ "$@" | sed -e '/^perl(XML::\(DOM::\|XQL)$\)/d'


Index: perl-XML-XQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XQL/EL-5/perl-XML-XQL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-XQL.spec	1 Sep 2006 02:53:58 -0000	1.4
+++ perl-XML-XQL.spec	10 Dec 2007 17:09:33 -0000	1.5
@@ -1,61 +1,58 @@
 Name:           perl-XML-XQL
 Version:        0.68
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for querying XML tree structures with XQL
-
-Group:          Development/Libraries
 License:        GPL or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XQL/
 Source0:        http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-XQL-%{version}.tar.gz
 Patch0:         %{name}-tput-147465.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl(XML::DOM) >= 1.29
-BuildRequires:  perl(Date::Manip)
+BuildRequires:  perl(Date::Manip) >= 5.33
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(LWP::UserAgent)
 BuildRequires:  perl(Parse::Yapp)
+BuildRequires:  perl(XML::DOM) >= 1.29
+BuildRequires:  perl(XML::Parser) >= 2.30
 Requires:       perl(XML::DOM)
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+Source99:       XML-XQL-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
 
 %description
 This is a Perl extension that allows you to perform XQL queries on XML
 object trees. Currently only the XML::DOM module is supported, but
 other implementations, like XML::Grove, may soon follow.
 
-
 %prep
 %setup -q -n XML-XQL-%{version}
 %patch0 -p0
 
-cat <<EOF > %{name}-prov
-#!/bin/sh
-# Filter versionless XML::XQL, we expect perl.prov to emit the versioned one.
-%{__perl_provides} \$* | grep -v 'perl(XML::\(DOM::\|XQL)$\)'
-EOF
-%define __perl_provides %{_builddir}/XML-XQL-%{version}/%{name}-prov
+sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
 chmod +x %{__perl_provides}
 
-
 %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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+rm -rf $RPM_BUILD_ROOT
+
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-
 %clean
-rm -rf %{buildroot}
-
+rm -rf $RPM_BUILD_ROOT %{__perl_provides}
 
 %files
 %defattr(-,root,root,-)
@@ -64,8 +61,13 @@
 %{perl_vendorlib}/XML/
 %{_mandir}/man3/XML::XQL*.3*
 
-
 %changelog
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.68-4
+- Reformat to match cpanspec output.
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.68-3
 - Rebuild for FC6
 




More information about the Fedora-perl-devel-list mailing list