[perl-File-MMagic] 1.28 bump and some cleanup

Petr Šabata psabata at fedoraproject.org
Tue Jun 5 13:12:03 UTC 2012


commit ff5cf966f0806acc0934067d52356e0d2f4fc618
Author: Petr Šabata <contyk at redhat.com>
Date:   Tue Jun 5 15:11:17 2012 +0200

    1.28 bump and some cleanup

 .gitignore            |    1 +
 perl-File-MMagic.spec |   46 ++++++++++++++++++++--------------------------
 sources               |    2 +-
 3 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df53593..64ab20f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ File-MMagic-1.22.tar.gz
 File-MMagic-1.25.tar.gz
 File-MMagic-1.26.tar.gz
 File-MMagic-1.27.tar.gz
+/File-MMagic-1.28.tar.gz
diff --git a/perl-File-MMagic.spec b/perl-File-MMagic.spec
index 5932c5c..4b5768f 100644
--- a/perl-File-MMagic.spec
+++ b/perl-File-MMagic.spec
@@ -1,56 +1,50 @@
 Name:           perl-File-MMagic
-Version:        1.27
-Release:        13%{?dist}
+Version:        1.28
+Release:        1%{?dist}
 Summary:        A Perl module emulating the file(1) command
-
 Group:          Development/Libraries
 License:        ASL 1.0 and BSD
 URL:            http://search.cpan.org/dist/File-MMagic/
 Source0:        http://www.cpan.org/authors/id/K/KN/KNOK/File-MMagic-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Test)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This module attempts to guess file type from its contents like file(1)
 command.
 
-
 %prep
-%setup -q -n File-MMagic-%{version} 
-
+%setup -q -n File-MMagic-%{version}
+iconv -f ISO-2022-JP -t utf8 README.ja > README.ja.utf8 && mv README.ja.utf8 README.ja
 
 %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/*
-
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w %{buildroot}/*
 
 %check
 make test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README.en
+%doc ChangeLog COPYING README.en README.ja
 %{perl_vendorlib}/File/
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Tue Jun 05 2012 Petr Šabata <contyk at redhat.com> - 1.28-1
+- 1.28 bump
+- Modernizing spec (removing buildroot, defattr, and command macros)
+- Removing trailing whitespace
+- Packaging README.ja
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -123,4 +117,4 @@ rm -rf $RPM_BUILD_ROOT
 - update to 1.15
 
 * Fri Dec 7 2001 root <root at redhat.com>
-- Spec file was autogenerated. 
+- Spec file was autogenerated.
diff --git a/sources b/sources
index e158e90..4302e74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ffb13b6587888e6e455c22988abce5e  File-MMagic-1.27.tar.gz
+ea74f4c817229117f4e9341889430308  File-MMagic-1.28.tar.gz


More information about the scm-commits mailing list