commit 686d9357e688183021cbc76a245468fd5c6d9221 Author: Ruediger Landmann <r.landmann@xxxxxxxxxx> Date: Fri Jan 17 11:48:24 2014 +1000 Use the spec file from EL perl-XML-Catalog.spec | 85 +++++++++++++++---------------------------------- 1 files changed, 26 insertions(+), 59 deletions(-) --- diff --git a/perl-XML-Catalog.spec b/perl-XML-Catalog.spec index 0e72436..9ca653d 100644 --- a/perl-XML-Catalog.spec +++ b/perl-XML-Catalog.spec @@ -1,91 +1,58 @@ -# Real version -%global cpan_version v1.0.1 - Name: perl-XML-Catalog -Version: %(echo '%{cpan_version}' | tr -d 'v') -Release: 4%{?dist} +Version: 1.0.1 +Release: 0%{?dist} Summary: Resolve public identifiers and remap system identifiers License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-Catalog/ -Source0: http://www.cpan.org/authors/id/J/JF/JFEARN/XML-Catalog-%{cpan_version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://www.cpan.org/modules/by-module/XML/XML-Catalog-v%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl -BuildRequires: perl(ExtUtils::MakeMaker) -# Run-time +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::More) +BuildRequires: perl(XML::Parser) BuildRequires: perl(LWP::Simple) -BuildRequires: perl(strict) -BuildRequires: perl(Text::ParseWords) BuildRequires: perl(URI::URL) -BuildRequires: perl(vars) -BuildRequires: perl(warnings) -BuildRequires: perl(XML::Parser) -# Tests -BuildRequires: perl(Cwd) -BuildRequires: perl(Test::More) +BuildRequires: perl(Text::ParseWords) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description This module implements draft 0.4 of John Cowan's XML Catalog (formerly -known as XCatalog) see -(<https://www.oasis-open.org/committees/entity/specs/cs-entity-xml-catalogs-1.0.html>) -Catalogs may be written in either SOCAT or XML syntax. XML::Catalog will -assume SOCAT syntax if the catalog is not in well-formed XML syntax. +known as XCatalog) and Oasis Catalogs. Catalogs may be written in either SOCAT +or XML syntax. XML::Catalog will assume SOCAT syntax if the catalog is not in +well-formed XML syntax. %prep -%setup -q -n XML-Catalog-%{cpan_version} +%setup -q -n XML-Catalog-v%{version} %build -for i in Changes README; do - sed -i 's/\r//' $i -done +%{__perl} Build.PL installdirs=vendor +./Build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%check +./Build test %install -rm -rf $RPM_BUILD_ROOT -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -%{_fixperms} $RPM_BUILD_ROOT/* - -%check -make test +%{__rm} -rf $RPM_BUILD_ROOT +./Build pure_install destdir=$RPM_BUILD_ROOT create_packlist=0 +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-, root, root, -) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog -* Thu Jan 16 2014 Rüdiger Landmann <rlandmann@xxxxxxxxxx> - 1.0.1-4 -- Specify buildroot - -* Thu Jan 16 2014 Rüdiger Landmann <rlandmann@xxxxxxxxxx> - 1.0.1-3 -- File perms - -* Thu Jan 16 2014 Rüdiger Landmann <rlandmann@xxxxxxxxxx> - 1.0.1-2 -- Clean buildroot in el5 - -* Mon Jan 13 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 1.0.1-1 -- 1.0.1 bump - -* Thu Oct 10 2013 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 1.0.0-1 -- 1.0.0 bump - -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.02-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.02-4 -- Perl 5.18 rebuild +* Mon Oct 28 2013 Jeff Fearn <jfearn@xxxxxxxxxx> 1.0.1-0 +- Fix test harness failing on some machines. RT #89415 +- Add Oasis support for nextCatalog. -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.02-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild +* Wed Oct 02 2013 Jeff Fearn <jfearn@xxxxxxxxxx> 1.0.0-0 +- new version * Fri Nov 23 2012 Jitka Plesnikova <jplesnik@xxxxxxxxxx> 0.02-2 - Update description -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel