From 11f8bc284148caddd745aed08f070d4ab4a56d3a Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Mon, 16 Sep 2013 14:34:42 +0200
Subject: [PATCH] drop the perl(Data::UUID) compatibility shim and require the
 real thing instead (#998591)

---
 uuid.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/uuid.spec b/uuid.spec
index 9333786..d046a7e 100644
--- a/uuid.spec
+++ b/uuid.spec
@@ -10,7 +10,7 @@
 
 Name:           uuid
 Version:        1.6.2
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -71,13 +71,15 @@ C++ development headers and libraries for OSSP uuid.
 %package perl
 Summary:        Perl support for Universally Unique Identifier library
 Group:          Development/Libraries
+BuildRequires:  perl(Data::UUID)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       %{name} = %{version}-%{release}
+Requires:       perl(Data::UUID)
 
 %description perl
-Perl OSSP uuid modules, which includes a Data::UUID replacement.
+Perl OSSP uuid module.
 
 %package php
 Summary:        PHP support for Universally Unique Identifier library
@@ -153,7 +155,7 @@ make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mfla
 
 # Build the Perl module.
 pushd perl
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=1
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=0
 %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags}
 popd
@@ -205,6 +207,9 @@ make check
 
 pushd perl
 LD_LIBRARY_PATH=../.libs make test
+# Check that current Data::UUID is compatible with old compat layer
+perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data::UUID::VERSION\n";'
+LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts
 popd
 
 pushd php
@@ -258,9 +263,7 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(-,root,root,-)
 %{perl_vendorarch}/auto/*
-%{perl_vendorarch}/Data*
 %{perl_vendorarch}/OSSP*
-%{_mandir}/man3/Data::UUID.3*
 %{_mandir}/man3/OSSP::uuid.3*
 
 %files php
@@ -283,6 +286,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Mon Sep 16 2013 Paul Howarth <paul@city-fan.org> - 1.6.2-23
+- drop the perl(Data::UUID) compatibility shim and require the real thing
+  instead (#998591)
+
 * Thu Sep 12 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-22
 - rebuild for postgresql api change