commit f4e67a2224f0a3451741fba136803099e6e3d04a
Author: Tom Callaway <spot@xxxxxxxxxxxxxxxxx>
Date: Thu Apr 12 14:09:34 2012 -0400
apply paul's fixes from bz 810719
perl-SQL-Abstract.spec | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/perl-SQL-Abstract.spec b/perl-SQL-Abstract.spec
index 2eebc4c..ca0df5e 100644
--- a/perl-SQL-Abstract.spec
+++ b/perl-SQL-Abstract.spec
@@ -1,13 +1,11 @@
Name: perl-SQL-Abstract
Version: 1.72
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Generate SQL from Perl data structures
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/SQL-Abstract
Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FREW/SQL-Abstract-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: perl(Test::Deep) >= 0.106
BuildRequires: perl(Test::Exception)
@@ -21,8 +19,7 @@ BuildRequires: perl(Hash::Merge) >= 0.12
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(List::Util)
BuildRequires: perl(Test::Builder)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(Class::Accessor::Grouped) >= 0.10002
Requires: perl(Getopt::Long::Descriptive) >= 0.086
Requires: perl(Hash::Merge) >= 0.12
@@ -32,6 +29,14 @@ Requires: perl(Hash::Merge) >= 0.12
%description
%{summary}.
+%package -n perl-DBIx-Class-Storage-Debug-PrettyPrint
+Summary: Pretty Printing DebugObj
+Group: Development/Libraries
+License: GPL+ or Artistic
+
+%description -n perl-DBIx-Class-Storage-Debug-PrettyPrint
+%{summary}.
+
%prep
%setup -q -n SQL-Abstract-%{version}
@@ -40,7 +45,6 @@ PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor
make
%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 {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
@@ -49,19 +53,24 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
%check
SQLATEST_TESTER=1 make test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc Changes
-%{_bindir}/*
-%{perl_vendorlib}/DBIx
-%{perl_vendorlib}/SQL
-%{_mandir}/man3/*.3*
-
+%{_bindir}/format-sql
+%{perl_vendorlib}/SQL/
+%{_mandir}/man3/SQL::Abstract.3pm*
+%{_mandir}/man3/SQL::Abstract::Test.3pm*
+%{_mandir}/man3/SQL::Abstract::Tree.3pm*
+
+%files -n perl-DBIx-Class-Storage-Debug-PrettyPrint
+%{perl_vendorlib}/DBIx/
+%{_mandir}/man3/DBIx::Class::Storage::Debug::PrettyPrint.3pm*
%changelog
+* Sun Apr 8 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 1.72-5
+- Split DBIx::Class::Storage::Debug::PrettyPrint off into its own sub-package
+ to avoid a dependency cycle, since perl-SQL-Abstract and perl-DBIx-Class
+ would otherwise require each other and make perl-DBIx-Class unbootable
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.72-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--
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
