From 08581e9e6165d02eaef573003c909ea39f59ccfe Mon Sep 17 00:00:00 2001 From: Petr Šabata Date: Jun 25 2015 09:07:25 +0000 Subject: Correct the dep list - Modernize and clean the spec a bit --- diff --git a/cpanspec.spec b/cpanspec.spec index 3d11b07..dd845c1 100644 --- a/cpanspec.spec +++ b/cpanspec.spec @@ -1,6 +1,6 @@ Name: cpanspec Version: 1.78 -Release: 21%{?dist} +Release: 22%{?dist} Summary: RPM spec file generation utility License: GPL+ or Artistic Group: Development/Tools @@ -9,10 +9,12 @@ Source0: http://sourceforge.net/downloads/%{name}/%{name}/%{version}/%{na Patch0: %{name}-1.78-Change-optimize-to-optflags.patch Patch1: %{name}-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch Patch2: %{name}-1.78-Escape-slashes-in-filters.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: perl BuildRequires: perl(Module::Build) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) Requires: /usr/bin/curl Requires: /usr/bin/repoquery Requires: rpm-build @@ -32,30 +34,26 @@ contained in the spec file is correct. %patch2 -p1 %build -%{__perl} Build.PL installdirs=vendor +perl Build.PL installdirs=vendor ./Build %install -rm -rf $RPM_BUILD_ROOT -./Build install destdir=$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/* - -# No tests. -#%check -#./Build test - -%clean -rm -rf $RPM_BUILD_ROOT +./Build install destdir=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} + +%{_fixperms} %{buildroot}/* %files -%defattr(-,root,root,-) -%doc Artistic BUGS Changes COPYING TODO +%{!?_licensedir:%global license %%doc} +%license Artistic COPYING +%doc BUGS Changes TODO %{_bindir}/* %{_mandir}/man1/* %changelog +* Thu Jun 25 2015 Petr Šabata - 1.78-22 +- Correct the dep list +- Modernize and clean the spec a bit + * Wed Jun 17 2015 Fedora Release Engineering - 1.78-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild