[perl-Expect] Spec clean-up
Paul Howarth
pghmcfc at fedoraproject.org
Mon Jan 23 13:15:28 UTC 2012
commit 021471319232db090fdc4669e61c83a4770ce1bb
Author: Paul Howarth <paul at city-fan.org>
Date: Mon Jan 23 13:14:38 2012 +0000
Spec clean-up
- Run the test suite in %check now that it no longer breaks in mock
- BR: perl(Carp), perl(Errno), perl(Exporter), perl(Fcntl), perl(IO::Handle)
and perl(POSIX)
- Make %files list more explicit
- Mark Expect.pod as %doc
- Use search.cpan.org source URL
- Use DESTDIR rather than PERL_INSTALL_ROOT
- Use %{_fixperms} macro rather than our own chmod incantation
- Don't use macros for commands
- Use tabs
.gitignore | 2 +-
perl-Expect.spec | 107 ++++++++++++++++++++++++++++++------------------------
2 files changed, 60 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a082bf..6e69afb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Expect-1.21.tar.gz
+/Expect-[0-9.]*.tar.gz
diff --git a/perl-Expect.spec b/perl-Expect.spec
index 85d2f2b..6104830 100644
--- a/perl-Expect.spec
+++ b/perl-Expect.spec
@@ -1,62 +1,73 @@
-Name: perl-Expect
-Version: 1.21
-Release: 10%{?dist}
-Summary: Expect for Perl
-
-Group: Development/Libraries
-License: GPL+ or Artistic
-URL: http://search.cpan.org/dist/Expect/
-Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/Expect-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-BuildRequires: perl(IO::Pty) >= 1.03
-BuildRequires: perl(IO::Tty) >= 1.03
-BuildRequires: perl(ExtUtils::MakeMaker)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name: perl-Expect
+Version: 1.21
+Release: 11%{?dist}
+Summary: Expect for Perl
+Group: Development/Libraries
+License: GPL+ or Artistic
+URL: http://search.cpan.org/dist/Expect/
+Source0: http://search.cpan.org/CPAN/authors/id/R/RG/RGIERSIG/Expect-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch: noarch
+BuildRequires: perl(Carp)
+BuildRequires: perl(Errno)
+BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Fcntl)
+BuildRequires: perl(IO::Handle)
+BuildRequires: perl(IO::Pty) >= 1.03
+BuildRequires: perl(IO::Tty) >= 1.03
+BuildRequires: perl(POSIX)
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
-This module provides Expect-like functionality to Perl. Expect is
+This module provides Expect-like functionality to Perl. Expect is
a tool for automating interactive applications such as telnet, ftp,
passwd, fsck, rlogin, tip, etc.
%prep
%setup -q -n Expect-%{version}
-%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/kibitz/kibitz tutorial/[2-6].*
-chmod a-x examples/ssh.pl examples/kibitz/kibitz tutorial/[2-6].*
-
+sed -i 's|^#!/usr/local/bin/perl|#!/usr/bin/perl|' examples/kibitz/kibitz tutorial/[2-6].*
+chmod -c a-x examples/ssh.pl examples/kibitz/kibitz tutorial/[2-6].*
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
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 -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
%check
-# switch off until tty works in mock
-#make test
-
+make test
%clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changes README examples/ tutorial/
-%{perl_vendorlib}/Expect.*
-%{_mandir}/man3/*.3pm*
-
+%doc %{perl_vendorlib}/Expect.pod
+%{perl_vendorlib}/Expect.pm
+%{_mandir}/man3/Expect.3pm*
%changelog
+* Mon Jan 23 2012 Paul Howarth <paul at city-fan.org> - 1.21-11
+- Spec clean-up
+ - Run the test suite in %%check now that it no longer breaks in mock
+ - BR: perl(Carp), perl(Errno), perl(Exporter), perl(Fcntl), perl(IO::Handle)
+ and perl(POSIX)
+ - Make %%files list more explicit
+ - Mark Expect.pod as %%doc
+ - Use search.cpan.org source URL
+ - Use DESTDIR rather than PERL_INSTALL_ROOT
+ - Use %%{_fixperms} macro rather than our own chmod incantation
+ - Don't use macros for commands
+ - Use tabs
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -67,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 16 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.21-7
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
* Sat May 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.21-6
- Mass rebuild with perl-5.12.0
@@ -76,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
- Mass rebuild with perl-5.12.0
* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 1.21-4
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -85,29 +96,29 @@ rm -rf $RPM_BUILD_ROOT
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.21-1
-- update to 1.21
+- Update to 1.21
* Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.20-2
-- rebuild for new perl
+- Rebuild for new perl
* Mon Oct 15 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.20-1.1
-- correct license tag
-- add BR: perl(ExtUtils::MakeMaker)
+- Correct license tag
+- Add BR: perl(ExtUtils::MakeMaker)
* Fri Jul 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.20-1
-- Update to 1.20.
+- Update to 1.20
* Tue Jul 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.19-1
-- Update to 1.19.
+- Update to 1.19
* Tue Jul 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.18-1
-- Update to 1.18.
+- Update to 1.18
* Wed May 31 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.17-1
-- Update to 1.17.
+- Update to 1.17
* Tue May 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-2
-- Description improved as suggested in #191622.
+- Description improved as suggested in #191622
* Mon May 08 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
-- First build.
+- First build
More information about the perl-devel
mailing list