cbm pushed to perl-Text-BibTeX (master). "Version bump, drop old patches"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 10 13:54:25 UTC 2015
From 138c7a4bb0ac702165465a2d1115ed5ef69683f8 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <macdonald at maths.ox.ac.uk>
Date: Wed, 10 Jun 2015 14:46:06 +0100
Subject: Version bump, drop old patches
diff --git a/.gitignore b/.gitignore
index df30c64..77b8dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Text-BibTeX-0.70.tar.gz
+/Text-BibTeX-0.71.tar.gz
diff --git a/Text-BibTeX-0.70-Stop-using-import-from-UNIVERSAL.patch b/Text-BibTeX-0.70-Stop-using-import-from-UNIVERSAL.patch
deleted file mode 100644
index ee29e1e..0000000
--- a/Text-BibTeX-0.70-Stop-using-import-from-UNIVERSAL.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up Text-BibTeX-0.70/lib/Text/BibTeX/Value.pm.orig Text-BibTeX-0.70/lib/Text/BibTeX/Value.pm
---- Text-BibTeX-0.70/lib/Text/BibTeX/Value.pm.orig 2015-04-30 10:13:15.785918161 +0200
-+++ Text-BibTeX-0.70/lib/Text/BibTeX/Value.pm 2015-04-30 10:21:35.467626175 +0200
-@@ -18,7 +18,6 @@
- package Text::BibTeX::Value;
-
- use strict;
--use UNIVERSAL 'isa';
- use Carp;
-
- use vars qw'$VERSION';
-@@ -206,7 +205,7 @@ sub new
- if ref $sval eq 'ARRAY' && @$sval == 2;
- croak "simple value is neither a two-element array ref " .
- "nor a Text::BibTeX::SimpleValue object"
-- unless isa ($sval, 'Text::BibTeX::SimpleValue');
-+ unless ref $sval eq 'Text::BibTeX::SimpleValue';
- push (@$self, $sval);
- }
-
diff --git a/perl-Text-BibTeX-secondary.patch b/perl-Text-BibTeX-secondary.patch
deleted file mode 100644
index 27bc703..0000000
--- a/perl-Text-BibTeX-secondary.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Text-BibTeX-0.70/Build.PL.secondary Text-BibTeX-0.70/Build.PL
---- Text-BibTeX-0.70/Build.PL.secondary 2014-12-13 11:46:40.000000000 +0100
-+++ Text-BibTeX-0.70/Build.PL 2014-12-13 11:47:27.000000000 +0100
-@@ -79,7 +79,7 @@ if ($^O =~ /mswin32/i) {
- unlink catfile($libdir, $target);
- }
- } else {
-- if ($Config{archname} =~ /^x86_64/) {
-+ if ($Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64/) {
- $libdir =~ s/\bbin\b/lib64/;
- if (!-d $libdir) {
- my $test = $libdir;
diff --git a/perl-Text-BibTeX.spec b/perl-Text-BibTeX.spec
index 5ecfc58..1b5670e 100644
--- a/perl-Text-BibTeX.spec
+++ b/perl-Text-BibTeX.spec
@@ -1,15 +1,11 @@
Name: perl-Text-BibTeX
-Version: 0.70
-Release: 6%{?dist}
+Version: 0.71
+Release: 1%{?dist}
Summary: Interface to read and parse BibTeX files
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Text-BibTeX/
Source0: http://www.cpan.org/authors/id/A/AM/AMBS/Text-BibTeX-%{version}.tar.gz
-# fix build on non-x86 64-bit arches
-Patch0: perl-Text-BibTeX-secondary.patch
-# Using import from UNIVERSAL is error now (RT#104119)
-Patch1: Text-BibTeX-0.70-Stop-using-import-from-UNIVERSAL.patch
BuildRequires: perl
BuildRequires: perl(base)
BuildRequires: perl(lib)
@@ -34,12 +30,14 @@ BuildRequires: perl(File::Temp)
BuildRequires: perl(File::Copy)
BuildRequires: perl(File::Path)
BuildRequires: perl(File::Spec::Functions)
-BuildRequires: perl(UNIVERSAL)
BuildRequires: perl(strict)
+# These don't work? perl(Scalar::List::Utils), perl(Scalar::Util)
+BuildRequires: perl-Scalar-List-Utils >= 1.42
BuildRequires: perl(vars)
BuildRequires: perl(warnings)
BuildRequires: chrpath
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl-Scalar-List-Utils >= 1.42
%description
The Text::BibTeX module processes BibTeX data. It includes object-oriented
@@ -48,7 +46,6 @@ entries, as well as other miscellaneous functions.
%prep
%setup -q -n Text-BibTeX-%{version}
-%patch0 -p1 -b .secondary
sed -ri 's#/usr/local/bin/perl5?#%{__perl}#' scripts/* examples/*
chmod a-x scripts/* examples/*
@@ -75,6 +72,9 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
%{_libdir}/*.so
%changelog
+* Wed Jun 10 2015 Colin B. Macdonald <cbm at m.fsf.org> 0.71-1
+- Version bump, drop old patches
+
* Fri Jun 05 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.70-6
- Perl 5.22 rebuild
diff --git a/sources b/sources
index d5eeaf6..b52dc6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dfdccab7c747d1805df432f4935ce66 Text-BibTeX-0.70.tar.gz
+a616d5df23dc0552a85608bd15bf03d1 Text-BibTeX-0.71.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-Text-BibTeX.git/commit/?h=master&id=138c7a4bb0ac702165465a2d1115ed5ef69683f8
More information about the scm-commits
mailing list