From 52e04cb5e86eca6b989a8a97c21805a8a4a78334 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova <jples...@redhat.com> Date: Mon, 9 Sep 2013 12:22:52 +0200 Subject: 1.00 bump; Specify all dependencies
--- .gitignore | 1 + do-not-link-libz.patch | 15 --------- file-5.10.patch | 83 ------------------------------------------------- perl-File-LibMagic.spec | 39 ++++++++++++++--------- sources | 2 +- 5 files changed, 26 insertions(+), 114 deletions(-) delete mode 100644 do-not-link-libz.patch delete mode 100644 file-5.10.patch diff --git a/.gitignore b/.gitignore index c076b1d..e5aa314 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ File-LibMagic-0.96.tgz +/File-LibMagic-1.00.tar.gz diff --git a/do-not-link-libz.patch b/do-not-link-libz.patch deleted file mode 100644 index a264b56..0000000 --- a/do-not-link-libz.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Ansgar Burchardt -Date: Sun, 11 Apr 2010 17:53:55 +0900 -Bug-Debian: http://bugs.debian.org/577288 -Subject: Do not link libz ---- libfile-libmagic-perl.orig/Makefile.PL -+++ libfile-libmagic-perl/Makefile.PL -@@ -15,7 +15,7 @@ - 'PREREQ_PM' => { }, - 'ABSTRACT_FROM' => 'LibMagic.pm', # retrieve abstract from module - 'AUTHOR' => 'Andreas Fitzner <andreas.fitz...@fv-berlin.de>', -- 'LIBS' => ['-lmagic -lz'], # e.g., '-lm' -+ 'LIBS' => ['-lmagic'], # e.g., '-lm' - 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => '-I.', # e.g., '-I. -I/usr/include/other' - # Un-comment this if you add C files to link with later: diff --git a/file-5.10.patch b/file-5.10.patch deleted file mode 100644 index 468f21e..0000000 --- a/file-5.10.patch +++ /dev/null @@ -1,83 +0,0 @@ -Description: adjust for magic 5.10 -Origin: vendor -Bug-Debian: http://bugs.debian.org/661800 -Author: gregor herrmann <gre...@debian.org> -Last-Update: 2012-03-01 - ---- a/t/2-easy.t -+++ b/t/2-easy.t -@@ -7,7 +7,7 @@ - is( MagicBuffer("Hello World\n"), 'ASCII text' ); - - is( MagicFile('t/samples/foo.txt'), 'ASCII text' ); --is( MagicFile('t/samples/foo.c' ), 'ASCII C program text' ); -+is( MagicFile('t/samples/foo.c' ), 'C source, ASCII text' ); - - # check the error handling - eval { MagicBuffer(undef) }; ---- a/t/3-complete.t -+++ b/t/3-complete.t -@@ -32,7 +32,7 @@ - is( magic_buffer( $handle, "Footastic\n" ), 'A foo file' ); - - is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text' ); -- is( magic_file( $handle, 't/samples/foo.c' ), 'ASCII C program text' ); -+ is( magic_file( $handle, 't/samples/foo.c' ), 'ASCII text' ); - is( magic_file( $handle, 't/samples/foo.foo' ), 'A foo file' ); - - magic_close($handle); -@@ -45,7 +45,7 @@ - is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' ); - - is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text' ); -- is( magic_file( $handle, 't/samples/foo.c' ), 'ASCII C program text' ); -+ is( magic_file( $handle, 't/samples/foo.c' ), 'C source, ASCII text' ); - is( magic_file( $handle, 't/samples/foo.foo' ), 'ASCII text' ); - - magic_close($handle); -@@ -58,7 +58,7 @@ - is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' ); - - is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text' ); -- is( magic_file( $handle, 't/samples/foo.c' ), 'ASCII C program text' ); -+ is( magic_file( $handle, 't/samples/foo.c' ), 'C source, ASCII text' ); - is( magic_file( $handle, 't/samples/foo.foo' ), 'ASCII text' ); - - magic_close($handle); ---- a/t/4-all.t -+++ b/t/4-all.t -@@ -8,7 +8,7 @@ - is( MagicBuffer("Hello World\n"), 'ASCII text' ); - - is( MagicFile('t/samples/foo.txt'), 'ASCII text' ); --is( MagicFile('t/samples/foo.c' ), 'ASCII C program text' ); -+is( MagicFile('t/samples/foo.c' ), 'C source, ASCII text' ); - - # subs from :complete - my $handle = magic_open(MAGIC_NONE); -@@ -16,7 +16,7 @@ - is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' ); - - is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text' ); --is( magic_file( $handle, 't/samples/foo.c' ), 'ASCII C program text' ); -+is( magic_file( $handle, 't/samples/foo.c' ), 'C source, ASCII text' ); - - magic_close($handle); - ---- a/t/6-oo.t -+++ b/t/6-oo.t -@@ -6,12 +6,12 @@ - - my %standard = ( - 'foo.foo' => [ 'ASCII text', 'text/plain; charset=us-ascii' ], -- 'foo.c' => [ 'ASCII C program text', 'text/x-c; charset=us-ascii' ], -+ 'foo.c' => [ 'C source, ASCII text', 'text/x-c; charset=us-ascii' ], - ); - - my %custom = ( - 'foo.foo' => [ 'A foo file', 'text/plain; charset=us-ascii' ], -- 'foo.c' => [ 'ASCII C program text', 'text/x-c; charset=us-ascii' ], -+ 'foo.c' => [ 'ASCII text', 'text/plain; charset=us-ascii' ], - ); - - plan tests => 4 + 4*(keys %standard) + 4*(keys %custom); diff --git a/perl-File-LibMagic.spec b/perl-File-LibMagic.spec index cca9a1b..06dd132 100644 --- a/perl-File-LibMagic.spec +++ b/perl-File-LibMagic.spec @@ -4,17 +4,29 @@ %define module File-LibMagic Name: perl-%{module} -Version: 0.96 -Release: 11%{?dist} +Version: 1.00 +Release: 1%{?dist} Summary: Perl wrapper/interface for libmagic License: GPL+ or Artistic Group: Development/Libraries -Source: http://search.cpan.org/CPAN/authors/id/F/FI/FITZNER/%{module}-%{version}.tgz +Source: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{module}-%{version}.tar.gz URL: http://search.cpan.org/dist/%{module}/ -Patch0: file-5.10.patch -Patch1: do-not-link-libz.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{_includedir}/magic.h, perl(ExtUtils::MakeMaker), perl(Test::More) +BuildRequires: %{_includedir}/magic.h +BuildRequires: perl(base) +BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) +BuildRequires: perl(lib) +BuildRequires: perl(strict) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::ParseWords) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,21 +36,13 @@ file (4.x or 5.x) package. %prep %setup -q -n %{module}-%{version} -# Update test suite to work with file 5.10 (CPAN RT#75457) -# Patch from debian -%patch0 -p1 - -# Don't need to link against libz (CPAN RT#56479) -# Patch from debian -%patch1 -p1 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make pure_install DESTDIR=$RPM_BUILD_ROOT find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -type f -name LibMagic.bs -exec rm -f {} \; @@ -60,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Sep 09 2013 Jitka Plesnikova <jples...@redhat.com> - 1.00-1 +- 1.00 bump +- Update source link +- Specify all dependencies + * Sat Aug 03 2013 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 0.96-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 21fe178..566ee11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -945f063eb9cd2ce555f452792320f601 File-LibMagic-0.96.tgz +5e39627e01170e5259b26351a92c4623 File-LibMagic-1.00.tar.gz -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-File-LibMagic.git/commit/?h=epel7&id=52e04cb5e86eca6b989a8a97c21805a8a4a78334 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel
