[perl-Text-vFile-asData/el5] Revert "Merge branch 'el6' into el5"

Xavier Bachelot xavierb at fedoraproject.org
Sun Jul 17 20:23:43 UTC 2011


commit 27eac5794e32d97a39d3e9eb57cf8747099395bc
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Jul 17 22:11:23 2011 +0200

    Revert "Merge branch 'el6' into el5"
    
    This reverts commit 528bd44a3d254911a3c81831c33cdd1cb33d0e7f, reversing
    changes made to 1497848deb77c984c4f1b0f579b7e9ce2be2961f.

 perl-Text-vFile-asData.spec |   52 +++++++++++++++++-------------------------
 sources                     |    2 +-
 2 files changed, 22 insertions(+), 32 deletions(-)
---
diff --git a/perl-Text-vFile-asData.spec b/perl-Text-vFile-asData.spec
index f315db9..f36ea73 100644
--- a/perl-Text-vFile-asData.spec
+++ b/perl-Text-vFile-asData.spec
@@ -1,6 +1,6 @@
 Name:           perl-Text-vFile-asData
-Version:        0.07
-Release:        2%{?dist}
+Version:        0.05
+Release:        3%{?dist}
 Summary:        Parse vFile formatted files into data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,43 +8,46 @@ URL:            http://search.cpan.org/dist/Text-vFile-asData/
 Source0:        http://www.cpan.org/authors/id/R/RC/RCLAMP/Text-vFile-asData-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl >= 0:5.006
 BuildRequires:  perl(Class::Accessor::Chained)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::More)
 
-# To be dropped in Fedora 16
-Obsoletes:      %{name}-utils < %{version}-%{release}
-Provides:       %{name}-utils = %{version}-%{release}
-
 # for improved tests
 BuildRequires:  perl(Test::Pod) >= 1.00
 
 # rpm doesn't catch this
-Requires:       perl(Class::Accessor::Chained::Fast)
+Requires:       perl(Class::Accessor::Chained)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Text::vFile::asData reads vFile format files, such as vCard (RFC 2426) and
 vCalendar (RFC 2445).
 
+%package utils
+Summary: Utilities using perl-Text-vFile-asData
+Group:          Development/Tools
+
+%description utils
+%{summary}
+
 %prep
 %setup -q -n Text-vFile-asData-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Build.PL installdirs=vendor
+./Build
 
 %install
 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 {} \;
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,25 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
-%changelog
-* Sat Sep 12 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.07-2
-- Remove Text-vFile-asData-0.07.diff.
-- Remove *-utils.
-
-* Sat Sep 11 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.07-1
-- Upstream update.
-- Install */bin (Add Text-vFile-asData-0.07.diff).
-- spec overhaul.
-
-* Fri May 07 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.05-6
-- Mass rebuild with perl-5.12.0
-
-* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
-- rebuild against perl 5.10.1
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
 
+%changelog
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index e1eaf96..4c97c7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f0fc1fbef2111a936db3eb4678ddccc  Text-vFile-asData-0.07.tar.gz
+3e2ec1f22562dc3d92ababac4f882bed  Text-vFile-asData-0.05.tar.gz


More information about the scm-commits mailing list