commit a7eabc82146929fb1ac53c2508be55996f78b11f
Author: Petr Sabata <contyk@xxxxxxxxxx>
Date: Tue Jul 26 14:32:14 2011 +0200
1.0 bump
.gitignore | 1 +
perl-RPM2-1.0-testplan.patch | 13 +++++++++++
perl-RPM2.spec | 47 ++++++++++++++++++-----------------------
sources | 2 +-
4 files changed, 36 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c5efe3..fb577ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
RPM2-0.68.tar.gz
/RPM2-0.69.tar.gz
+/RPM2-1.0.tar.gz
diff --git a/perl-RPM2-1.0-testplan.patch b/perl-RPM2-1.0-testplan.patch
new file mode 100644
index 0000000..b3b80ba
--- /dev/null
+++ b/perl-RPM2-1.0-testplan.patch
@@ -0,0 +1,13 @@
+diff --git a/test.pl b/test.pl
+index 116c48a..40426ed 100644
+--- a/test.pl
++++ b/test.pl
+@@ -11,7 +11,7 @@ use strict;
+
+ use Test;
+ use strict;
+-BEGIN { plan tests => 62 };
++BEGIN { plan tests => 60 };
+ use RPM2;
+ use POSIX;
+ ok(1); # If we made it this far, we're ok.
diff --git a/perl-RPM2.spec b/perl-RPM2.spec
index e6fe657..c25fcbc 100644
--- a/perl-RPM2.spec
+++ b/perl-RPM2.spec
@@ -1,13 +1,17 @@
Name: perl-RPM2
-Version: 0.69
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
Summary: Perl bindings for the RPM Package Manager API
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/RPM2/
Source0: http://www.cpan.org/authors/id/L/LK/LKUNDRAK/RPM2-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: rpm-devel perl(ExtUtils::MakeMaker)
+Patch0: %{name}-1.0-testplan.patch
+BuildRequires: rpm-devel
+BuildRequires: perl(Module::Build) >= 0.3500
+# Tests
+BuildRequires: perl(Test)
+BuildRequires: perl(POSIX)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%{?perl_default_filter}
@@ -17,45 +21,36 @@ The RPM2 module provides an object-oriented interface to querying both the
installed RPM database as well as files on the filesystem, providing Perl
bindings for the RPM Package Manager API.
-
%prep
%setup -q -n RPM2-%{version}
-
+%patch0 -p1 -b .testplan
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-make %{?_smp_mflags}
-
+%{__perl} Build.PL installdirs=vendor
+./Build
%install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
+./Build install destdir=%{buildroot} create_packlist=0
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
%{_fixperms} $RPM_BUILD_ROOT/*
-
%check
-make test
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+./Build test verbose=1
%files
-%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/RPM2*
%{_mandir}/man3/*
-
%changelog
+* Tue Jul 26 2011 Petr Sabata <contyk@xxxxxxxxxx> - 1.0-1
+- 1.0 bump
+- Switching to Module::Build
+- Removing redundant buildroot and defattr stuff
+- Adding testplan patch to match test count
+
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 0.69-4
- Perl mass rebuild
diff --git a/sources b/sources
index 252af22..5ffb7ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-202edc6fdfffab604c68dbae8beb7070 RPM2-0.69.tar.gz
+c68361fe4511707526c66553a4eadb7f RPM2-1.0.tar.gz
--
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
