psabata pushed to perl-Kwiki (master). "Modernize the spec and correct the dep list"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 14:52:20 UTC 2015


>From b50b4110e9e631650ea9c509e5331547e1eee472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk at redhat.com>
Date: Tue, 31 Mar 2015 16:52:13 +0200
Subject: Modernize the spec and correct the dep list


diff --git a/perl-Kwiki.spec b/perl-Kwiki.spec
index a81f760..f5bdd3a 100644
--- a/perl-Kwiki.spec
+++ b/perl-Kwiki.spec
@@ -1,27 +1,63 @@
 Name:           perl-Kwiki
 Version:        0.39
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Kwiki Wiki Building Framework
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Kwiki/
 Source0:        http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+# Build
+BuildRequires:  perl
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(ExtUtils::MM_Unix)
+BuildRequires:  perl(File::Basename)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+# Runtime
+BuildRequires:  perl(base)
+# XXX: BuildRequires:  perl(CPAN)
+# XXX: BuildRequires:  perl(CPAN::Config)
+BuildRequires:  perl(HTTP::BrowserDetect)
+# This is actually Spiffy::mixin, the namespace is loaded via Spoon::Config
+# XXX: BuildRequires:  perl(mixin)
+BuildRequires:  perl(Spoon) >= 0.22
+BuildRequires:  perl(Spoon::Base)
+BuildRequires:  perl(Spoon::CGI)
+BuildRequires:  perl(Spoon::Command)
+BuildRequires:  perl(Spoon::Config)
+BuildRequires:  perl(Spoon::ContentObject)
+BuildRequires:  perl(Spoon::Cookie)
+BuildRequires:  perl(Spoon::Formatter)
+BuildRequires:  perl(Spoon::Formatter::Block)
+BuildRequires:  perl(Spoon::Formatter::Container)
+BuildRequires:  perl(Spoon::Formatter::Phrase)
+BuildRequires:  perl(Spoon::Formatter::Unit)
+BuildRequires:  perl(Spoon::Hub)
+BuildRequires:  perl(Spoon::Installer)
+BuildRequires:  perl(Spoon::MetadataObject)
+BuildRequires:  perl(Spoon::Plugin)
+BuildRequires:  perl(Spoon::Registry)
+BuildRequires:  perl(Spoon::Template)
+BuildRequires:  perl(Spoon::Template::TT2)
+BuildRequires:  perl(warnings)
+# Tests only
 BuildRequires:  perl(IO::All)
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Spiffy)
 BuildRequires:  perl(Test::More)
+# Optional tests only
 BuildRequires:  perl(Test::Memory::Cycle)
-BuildRequires:  perl(Spoon) >= 0.22
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
+Requires:       perl(CPAN)
+Requires:       perl(CPAN::Config)
+Requires:       perl(Cwd)
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# RPM 4.8 filters
-%{?filter_setup:
-%filter_from_requires /^perl(mixin)/d
-%{?perl_default_filter}
-}
-# RPM 4.9 filters
+# This is actually Spiffy::mixin; it's all rather obscure
 %global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(mixin\\)$
 
 %description
@@ -46,27 +82,17 @@ plugins available, this will hopefully be the case.
 %setup -q -n Kwiki-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %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 -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_bindir}/*
@@ -74,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Mar 31 2015 Petr Ĺ abata <contyk at redhat.com> - 0.39-23
+- Modernize the spec and correct the dep list
+
 * Fri Aug 29 2014 Jitka Plesnikova <jplesnik at redhat.com> - 0.39-22
 - Perl 5.20 rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Kwiki.git/commit/?h=master&id=b50b4110e9e631650ea9c509e5331547e1eee472


More information about the scm-commits mailing list