From 1cf55cfc3380258317aea091bdc026849f2152e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Mon, 16 Jul 2012 16:24:19 +0200
Subject: [PATCH] 0.84 bump

---
 .gitignore              |  1 +
 perl-YAML.spec          | 35 ++++++++++++++++++-----------------
 perl5.16-YAML-Any.patch | 12 ------------
 sources                 |  2 +-
 4 files changed, 20 insertions(+), 30 deletions(-)
 delete mode 100644 perl5.16-YAML-Any.patch

diff --git a/.gitignore b/.gitignore
index 0036220..0016a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ YAML-0.71.tar.gz
 /YAML-0.72.tar.gz
 /YAML-0.73.tar.gz
 /YAML-0.81.tar.gz
+/YAML-0.84.tar.gz
diff --git a/perl-YAML.spec b/perl-YAML.spec
index 9c3d8ca..a7c0dd5 100644
--- a/perl-YAML.spec
+++ b/perl-YAML.spec
@@ -1,21 +1,21 @@
 Name:           perl-YAML
-Version:        0.81
-Release:        4%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/YAML/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-%{version}.tar.gz
-# https://rt.cpan.org/Public/Bug/Display.html?id=74226
-Patch0:         perl5.16-YAML-Any.patch
-
 BuildArch:      noarch
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Test::Base)
+BuildRequires:  perl(Test::Base::Filter)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
 Requires:       perl(Data::Dumper)
 
@@ -30,29 +30,25 @@ specification.
 
 %prep
 %setup -q -n YAML-%{version}
-%patch0 -p1
 
 # Re-code docs as UTF-8
 iconv -f iso-8859-1 -t utf8 < README > README.utf8
 mv README.utf8 README
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+perl Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-
+make pure_install DESTDIR=%{buildroot}
 # Removing Test::YAML (at least temporarily) due
 # to security concerns and questionable value.
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197539
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Test/YAML* \
-    $RPM_BUILD_ROOT%{_mandir}/man3/Test::YAML*.3*
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+rm -f %{buildroot}%{perl_vendorlib}/Test/YAML* \
+    %{buildroot}%{_mandir}/man3/Test::YAML*.3*
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -63,6 +59,11 @@ make test
 %{_mandir}/man3/YAML*.3*
 
 %changelog
+* Mon Jul 16 2012 Petr Šabata <contyk@redhat.com> - 0.84-1
+- 0.84 bump
+- Drop command macros
+- Drop previously added patch (included in 0.82)
+
 * Fri Jun 22 2012 Jitka Plesnikova <jplesnik@redhat.com> 0.81-4
 - apply patch to for YAML::Any RT#74226
 
diff --git a/perl5.16-YAML-Any.patch b/perl5.16-YAML-Any.patch
deleted file mode 100644
index 6ea0ba2..0000000
--- a/perl5.16-YAML-Any.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up YAML-0.81/lib/YAML/Any.pm.orig YAML-0.81/lib/YAML/Any.pm
---- YAML-0.81/lib/YAML/Any.pm.orig	2012-06-22 11:05:12.770546934 +0200
-+++ YAML-0.81/lib/YAML/Any.pm	2012-06-22 11:05:34.728670103 +0200
-@@ -95,7 +95,7 @@ sub LoadFile {
- 
- sub order {
-     return @YAML::Any::_TEST_ORDER
--        if defined @YAML::Any::_TEST_ORDER;
-+        if @YAML::Any::_TEST_ORDER;
-     return @implementations;
- }
- 
diff --git a/sources b/sources
index d8e88dc..5a5d025 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1aaddf963786d70518236ae6f6347cad  YAML-0.81.tar.gz
+3644f03e3da5d99158963c6613f5ff92  YAML-0.84.tar.gz