From 8d7bc9decd65455683ba2d4a5ba47e4be850c9d8 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 2 Jan 2018 14:12:47 +0000 Subject: [PATCH] Spec clean up - Drop POD patch, fixed in 1.67 - Fix source URL to refer to current upstream maintainer - Escape macro used in changelog (#1527541) - Drop legacy Group: and BuildRoot: tags - Drop %defattr, redundant since rpm 4.4 - Use %license where possible - Drop redundant buildroot cleaning - Don't need to remove empty directories from the buildroot - Simplify find command using -delete - Specify all build dependencies - Make %files list more explicit None of these changes break compatibility with EPEL-6, the oldest currently-supported target. --- ...nfig-1.66-Remove-stray-item-from-POD.patch | 45 ------------ perl-AppConfig.spec | 68 ++++++++++++------- 2 files changed, 45 insertions(+), 68 deletions(-) delete mode 100644 AppConfig-1.66-Remove-stray-item-from-POD.patch diff --git a/AppConfig-1.66-Remove-stray-item-from-POD.patch b/AppConfig-1.66-Remove-stray-item-from-POD.patch deleted file mode 100644 index 87d5e9e..0000000 --- a/AppConfig-1.66-Remove-stray-item-from-POD.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 64ddb19e19666f9d5d9af0e298a1751da5c02519 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 18 Jul 2013 17:44:18 +0200 -Subject: [PATCH] Remove stray =item from POD -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - -Signed-off-by: Petr Písař ---- - lib/AppConfig/State.pm | 2 -- - lib/AppConfig/Sys.pm | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/lib/AppConfig/State.pm b/lib/AppConfig/State.pm -index 8374f1c..0d064ee 100644 ---- a/lib/AppConfig/State.pm -+++ b/lib/AppConfig/State.pm -@@ -1268,8 +1268,6 @@ Be aware that calling C<$state-Eset()> to update the same variable - from within the ACTION function will cause a recursive loop as the - ACTION function is repeatedly called. - --=item -- - =back - - =head2 DEFINING VARIABLES USING THE COMPACT FORMAT -diff --git a/lib/AppConfig/Sys.pm b/lib/AppConfig/Sys.pm -index 38ddcc2..72692c3 100644 ---- a/lib/AppConfig/Sys.pm -+++ b/lib/AppConfig/Sys.pm -@@ -280,8 +280,6 @@ Calls the system function getpwuid() if available and returns the result. - Returns undef if not available. The can_getpwuid() method can be called to - determine if this function is available. - --=item -- - =back - - =head1 AUTHOR --- -1.8.1.4 - diff --git a/perl-AppConfig.spec b/perl-AppConfig.spec index 8b292a6..6de5881 100644 --- a/perl-AppConfig.spec +++ b/perl-AppConfig.spec @@ -1,25 +1,36 @@ Name: perl-AppConfig Version: 1.71 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Perl module for reading configuration files -Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/AppConfig/ -Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-%{version}.tar.gz -# Fix documentation, CPAN RT#84318 -# Patch0: AppConfig-1.66-Remove-stray-item-from-POD.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/AppConfig-%{version}.tar.gz BuildArch: noarch +# Build: +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl-generators +BuildRequires: perl%{?fedora:-interpreter} +BuildRequires: perl(ExtUtils::MakeMaker) +# Runtime: BuildRequires: perl(base) +BuildRequires: perl(Config) +BuildRequires: perl(constant) BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Getopt::Long) >= 2.17 +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +# Test Suite: BuildRequires: perl(lib) BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Pod) +BuildRequires: perl(vars) +# Optional Tests: +BuildRequires: perl(Test::Pod) >= 1.14 +# Dependencies: Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -43,7 +54,6 @@ automatically become available through AppConfig. %prep %setup -q -n AppConfig-%{version} -# %patch0 -p1 %build @@ -52,29 +62,41 @@ make %{?_smp_mflags} %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 -depth -type d -empty -exec rmdir {} ';' -chmod -R u+w $RPM_BUILD_ROOT/* +find $RPM_BUILD_ROOT -type f -name .packlist -delete +chmod -R u+w $RPM_BUILD_ROOT %check AUTOMATED_TESTING=1 make test -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc Changes LICENSE README TODO -%{perl_vendorlib}/* -%{_mandir}/man3/*.3pm* +%if 0%{?_licensedir:1} +%license LICENSE +%else +%doc LICENSE +%endif +%doc Changes README TODO +%{perl_vendorlib}/AppConfig.pm +%{perl_vendorlib}/AppConfig/ +%{_mandir}/man3/AppConfig*.3* %changelog +* Tue Jan 2 2018 Paul Howarth - 1.71-10 +- Drop POD patch, fixed in 1.67 +- Fix source URL to refer to current upstream maintainer +- Escape macro used in changelog (#1527541) +- Drop legacy Group: and BuildRoot: tags +- Drop %%defattr, redundant since rpm 4.4 +- Use %%license where possible +- Drop redundant buildroot cleaning +- Don't need to remove empty directories from the buildroot +- Simplify find command using -delete +- Specify all build dependencies +- Make %%files list more explicit + * Thu Jul 27 2017 Fedora Release Engineering - 1.71-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -192,14 +214,14 @@ rm -rf $RPM_BUILD_ROOT * Wed Dec 28 2005 Jose Pedro Oliveira - 1.56-3 - Dist tag. -* Fri Apr 7 2005 Michael Schwendt - 1.56-2 +* Wed Apr 6 2005 Michael Schwendt - 1.56-2 - rebuilt * Sun May 23 2004 Jose Pedro Oliveira - 0:1.56-0.fdr.1 - Update to 1.56. - License corrected. - Require perl >= 1:5.6.1 for vendor install dir support. -- Moved make test to section %check. +- Moved make test to section %%check. - Use pure_install to avoid perllocal.pod workarounds. * Sun Oct 12 2003 Ville Skyttä - 0:1.55-0.fdr.1