Merge branch 'master' of ssh://pkgs.fedoraproject.org/uuid

Conflicts:
	uuid.spec

uuid.spec

@@ -10,7 +10,7 @@
 
 Name:           uuid
 Version:        1.6.2
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -31,7 +31,7 @@ Patch6: uuid-aarch64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libtool
 
-Obsoletes:      %{name}-pgsql < 1.6.2-22
+Obsoletes:      %{name}-pgsql < 1.6.2-24
 
 %description
 OSSP uuid is a ISO-C:1999 application programming interface (API)
@@ -73,13 +73,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
@@ -144,7 +146,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
@@ -196,6 +198,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
@@ -249,9 +254,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
@@ -269,10 +272,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
-* Wed Oct 30 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-23
+* Wed Oct 30 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-24
 - drop uuid-pgsql subpackage, it is outdated and does not work, use 
   uuid-ossp module from postgresql-contrib instead
 
+* 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