Attachment 788099 Details for Bug 998591 – Sample implementation

[patch] Sample implementation

0001-Drop-the-perl-Data-UUID-compatibility-shim.patch (text/plain), 2.60 KB, created by Paul Howarth on 2013-08-19 14:42:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Howarth

Created: 2013-08-19 14:42:25 UTC

Size: 2.60 KB

patch

obsolete

>From 645ce38041e6d8911cfb8fe55748f0aa2a74bec5 Mon Sep 17 00:00:00 2001
>From: Paul Howarth <paul@city-fan.org>
>Date: Mon, 19 Aug 2013 15:23:04 +0100
>Subject: [PATCH] Drop the perl(Data::UUID) compatibility shim...
>
>... and require the real thing instead
>---
> uuid.spec | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
>diff --git a/uuid.spec b/uuid.spec
>index df27bd4..34b1599 100644
>--- a/uuid.spec
>+++ b/uuid.spec
>@@ -10,7 +10,7 @@
> 
> Name:           uuid
> Version:        1.6.2
>-Release:        21%{?dist}
>+Release:        22%{?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 Aug 19 2013 Paul Howarth <paul@city-fan.org> - 1.6.2-22
>+- drop the perl(Data::UUID) compatibility shim and require the real thing
>+  instead
>+
> * Wed Aug 14 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-21
> - fix aarch64 support (#926687)
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 998591: 788099