Hello community, here is the log from the commit of package uuid for openSUSE:Factory checked in at Thu May 26 18:04:55 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ uuid/uuid.changes 2011-04-21 11:24:57.000000000 +0200 @@ -0,0 +1,78 @@ +------------------------------------------------------------------- +Thu Apr 21 09:22:59 UTC 2011 - [email protected] + +- Remove the separate postgresql-uuid package, as we are using + the verion that comes with the PostgreSQL sources. +- Remove pointless RPM macro-itis +- Silence rpmlint warnings regarding macros in comments + +------------------------------------------------------------------- +Thu Apr 14 21:08:59 UTC 2011 - [email protected] + +- update pgsql patch. we dont need a soversioned pgsql plugin. + +------------------------------------------------------------------- +Thu Apr 14 19:43:02 UTC 2011 - [email protected] + +- added debian patches + 0001-Change-library-name.patch + 0002-uuid-preserve-m-option-status-in-v-option-handling.patch + 0003-Fix-whatis-entries.patch +- we adapt their packaging style to to avoid conflicts with libuuid + from e2fsprogs + +------------------------------------------------------------------- +Thu Apr 14 16:35:29 UTC 2011 - [email protected] + +- update to 1.6.2 + o Adjust "devtool.func" for latest GNU Libtool compatibility. + [Ralf S. Engelschall] + o Consistently annotate "RFC-XXXX" with "IETF" to clearly + indicate from which standards body this comes from. + [Ralf S. Engelschall] + o Resolve namespace conflicts of recently introduced time_xxx() + functions by using a propoer "uuid_" prefix. + [Ralf S. Engelschall] + o Remove unused "struct timezone" from time_gettimeofday() in + order to simplify portability. + [Ralf S. Engelschall] + o Add support for POSIX clock_gettime(3) in case the Unix/POSIX + gettimeofday(3) is not available. + [Ralf S. Engelschall] +- added uuid-1.6.2_pgsql.patch: + fix building of the pgsql extension +- split shared libraries into 3 subpackages +- drop requires from the library subpackage to the cmdline tool +- split pgsql extension building into its own subpackage + +------------------------------------------------------------------- +Tue Jun 19 22:37:26 CEST 2007 - [email protected] + +- update to 1.6.0 + o Adjust copyright messages for new year 2008. + [Ralf S. Engelschall] + o Fix __VA_COPY_USE_{CSP,CPP} fallback macros for va_copy. + [Mark A. Lindner <[email protected]>] + o PostgreSQL bindings: use SET_VARSIZE() instead + of assigning to bytea->v_len under PostgreSQL >= 8.3 + [Ralf S. Engelschall] +- don't build static libs +- remove unneeded .la files + +------------------------------------------------------------------- +Tue Jun 19 21:51:57 CEST 2007 - [email protected] + +- reenable perl bindings +- split out the libraries according to the shared library policy +- remove unneeded requires + +------------------------------------------------------------------- +Tue Jun 19 21:17:55 CEST 2007 - [email protected] + +- fixed most warnings from rpmlint + +------------------------------------------------------------------- +Tue Jun 19 21:03:50 CEST 2007 - [email protected] + +- initital package in the buildservice + calling whatdependson for head-i586 New: ---- 0001-Change-library-name.patch 0002-uuid-preserve-m-option-status-in-v-option-handling.patch 0003-Fix-whatis-entries.patch uuid-1.5.0_perl_vendor_install.patch uuid-1.6.0_php.patch uuid-1.6.2.tar.bz2 uuid.changes uuid.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uuid.spec ++++++ # # spec file for package uuid # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: uuid Version: 1.6.2 Release: 1 %define with_perl 1 # License: X11/MIT Group: Development/Libraries/C and C++ # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # Url: http://www.ossp.org/pkg/lib/%{name}/ # ftp://ftp.ossp.org/pkg/lib/%%{name}/%%{name}-%%{version}.tar.gz Source: %{name}-%{version}.tar.bz2 Patch0: uuid-1.5.0_perl_vendor_install.patch Patch1: uuid-1.6.0_php.patch Patch3: 0001-Change-library-name.patch Patch4: 0002-uuid-preserve-m-option-status-in-v-option-handling.patch Patch5: 0003-Fix-whatis-entries.patch # Summary: OSSP uuid - Universally Unique Identifier %description OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. %package -n ossp-uuid Group: Development/Libraries/C and C++ Provides: %{name} = %{version}-%{release} # Summary: OSSP uuid - Universally Unique Identifier %description -n ossp-uuid OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. %define pkg_libname libossp-uuid16 %package -n %{pkg_libname} Group: Development/Libaries/C and C++ Summary: Shared library for uuid %description -n %{pkg_libname} OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. This package contains the shared library of OSSP uuid. %define pkg_cxx_libname libossp-uuid++16 %package -n %{pkg_cxx_libname} Group: Development/Libaries/C and C++ Summary: Shared library for uuid %description -n %{pkg_cxx_libname} OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. This package contains the shared c++ library with of OSSP uuid. %define pkg_dce_libname libossp-uuid_dce16 %package -n %{pkg_dce_libname} Group: Development/Libaries/C and C++ Summary: Shared library for uuid %description -n %{pkg_dce_libname} OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. This package contains the shared library with dce compat of OSSP uuid. %package devel Group: Development/Libaries/C and C++ Requires: %{pkg_libname} = %{version} Requires: %{pkg_cxx_libname} = %{version} Requires: %{pkg_dce_libname} = %{version} Summary: Development files for OSSP uuid %description devel OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. This package contains the development files for OSSP uuid. %if 0%{?with_perl} %package -n perl-OSSP-uuid Group: Development/Libaries/Perl %if 0%{?suse_version} > 1020 Requires: perl-base = %{perl_version} %else Requires: perl = %{perl_version} %endif Summary: Perl bindings for OSSP uuid %description -n perl-OSSP-uuid OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. UUIDs are 128 bit numbers which are intended to have a high likelihood of uniqueness over space and time and are computationally difficult to guess. They are globally unique identifiers which can be locally generated without contacting a global registration authority. UUIDs are intended as unique identifiers for both mass tagging objects with an extremely short lifetime and to reliably identifying very persistent objects across a network. This package contains perl bindings for OSSP uuid. %endif %prep %setup %patch0 %patch1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %build export CXXFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --includedir=%{_includedir}/ossp/ \ --disable-static \ --with-cxx \ %if 0%{?with_php} --with-php \ %endif %if 0%{?with_perl} --with-perl \ --with-perl-compat \ %endif --with-dce make LD_RUN_PATH="" %install %makeinstall %perl_process_packlist rm -rv %{buildroot}%{_libdir}/*.la mv -v %{buildroot}%{_libdir}/pkgconfig/{,ossp-}uuid.pc mv -v %{buildroot}%{_mandir}/man3/uuid.3{,ossp} mv -v %{buildroot}%{_mandir}/man3/uuid++.3{,ossp} %check %ifnarch %arm LD_LIBRARY_PATH="$PWD/.libs/" make check %endif %clean rm -rf %{buildroot} %post -n %{pkg_libname} -p /sbin/ldconfig %postun -n %{pkg_libname} -p /sbin/ldconfig %post -n %{pkg_dce_libname} -p /sbin/ldconfig %postun -n %{pkg_dce_libname} -p /sbin/ldconfig %post -n %{pkg_cxx_libname} -p /sbin/ldconfig %postun -n %{pkg_cxx_libname} -p /sbin/ldconfig %files -n ossp-uuid %defattr(-,root,root,-) %doc AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW README SEEALSO THANKS TODO USERS %{_mandir}/man1/uuid.1* %{_bindir}/uuid %files -n %{pkg_libname} %defattr(-,root,root,-) %{_libdir}/libossp-uuid.so.* %files -n %{pkg_dce_libname} %defattr(-,root,root,-) %{_libdir}/libossp-uuid_dce.so.* %files -n %{pkg_cxx_libname} %defattr(-,root,root,-) %{_libdir}/libossp-uuid++.so.* %files devel %defattr(-,root,root,-) %{_bindir}/uuid-config %dir %{_includedir}/ossp/ %{_includedir}/ossp/uuid.h %{_includedir}/ossp/uuid_dce.h %{_includedir}/ossp/uuid++.hh %{_libdir}/pkgconfig/ossp-uuid.pc %{_libdir}/libossp-uuid.so %{_libdir}/libossp-uuid_dce.so %{_libdir}/libossp-uuid++.so %{_mandir}/man3/uuid.3* %{_mandir}/man3/uuid++.3* %{_mandir}/man1/uuid-config.1* %if 0%{?with_perl} %files -n perl-OSSP-uuid %defattr(-,root,root,-) %{perl_vendorarch}/auto/OSSP/ %{perl_vendorarch}/OSSP/ # %dir %{perl_vendorarch}/Data/ %{perl_vendorarch}/Data/UUID.pm %{perl_vendorarch}/Data/UUID.pod # %{_mandir}/man3/OSSP::uuid.3* %{_mandir}/man3/Data::UUID.3* %if 0%{?suse_version} && 0%{?suse_version} < 1140 /var/adm/perl-modules/uuid %endif %endif %changelog ++++++ 0001-Change-library-name.patch ++++++ From: Piotr Roszatycki <[email protected]> Date: Wed, 27 Jan 2010 16:53:11 +0100 Subject: [PATCH] Change library name The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's uuid library. --- Makefile.in | 6 +++--- perl/Makefile.PL | 12 ++++++------ php/config.m4 | 2 +- uuid-config.in | 2 +- uuid.pc.in | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index d28f4be..c2ba99d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,13 +62,13 @@ PERL = @PERL@ PHP = @PHP@ PG_CONFIG = @PG_CONFIG@ -LIB_NAME = libuuid.la +LIB_NAME = libossp-uuid.la LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo -DCE_NAME = libuuid_dce.la +DCE_NAME = libossp-uuid_dce.la DCE_OBJS = uuid_dce.lo $(LIB_OBJS) -CXX_NAME = libuuid++.la +CXX_NAME = libossp-uuid++.la CXX_OBJS = uuid++.lo $(LIB_OBJS) PRG_NAME = uuid diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 92f4494..9c6fee6 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -33,9 +33,9 @@ use Config; use ExtUtils::MakeMaker; # determine source directory -my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } - grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) - or die "no source directory found (where libuuid.la is located)"; +my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } + grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) + or die "no source directory found (where libossp-uuid.la is located)"; # determine extra build options my $compat = 0; @@ -47,15 +47,15 @@ WriteMakefile( VERSION_FROM => 'uuid.pm', ABSTRACT_FROM => 'uuid.pod', PREREQ_PM => {}, - LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], + LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], DEFINE => '', INC => "-I. -I$srcdir", PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), }, - MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3', - ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), }, + MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm', + ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), }, TYPEMAPS => [ 'uuid.tm' ], test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') }, NO_META => 1, diff --git a/php/config.m4 b/php/config.m4 index 5091b96..969b457 100644 --- a/php/config.m4 +++ b/php/config.m4 @@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) PHP_ADD_LIBPATH([..], ) - PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) + PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) PHP_ADD_INCLUDE([..]) PHP_SUBST(UUID_SHARED_LIBADD) diff --git a/uuid-config.in b/uuid-config.in index 8d2a063..5b58812 100644 --- a/uuid-config.in +++ b/uuid-config.in @@ -121,7 +121,7 @@ do output_extra="$output_extra $uuid_ldflags" ;; --libs) - output="$output -luuid" + output="$output -lossp-uuid" output_extra="$output_extra $uuid_libs" ;; * ) diff --git a/uuid.pc.in b/uuid.pc.in index c76ad1e..de00c2f 100644 --- a/uuid.pc.in +++ b/uuid.pc.in @@ -36,7 +36,7 @@ Name: OSSP uuid Description: Universally Unique Identifier (UUID) Library Version: @UUID_VERSION_RAW@ URL: http://www.ossp.org/pkg/lib/uuid/ -Cflags: -I${includedir} -Libs: -L${libdir} -luuid +Cflags: -I${includedir}/ossp +Libs: -L${libdir} -lossp-uuid Libs.private: @LIBS@ -- ++++++ 0002-uuid-preserve-m-option-status-in-v-option-handling.patch ++++++ From: Marco Nenciarini <[email protected]> Date: Wed, 27 Jan 2010 19:46:21 +0100 Subject: [PATCH] uuid: preserve -m option status in -v option handling Bug: 531396 --- uuid_cli.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/uuid_cli.c b/uuid_cli.c index d1b0b11..14a67fe 100644 --- a/uuid_cli.c +++ b/uuid_cli.c @@ -140,11 +140,12 @@ int main(int argc, char *argv[]) i = strtol(optarg, &p, 10); if (*p != '\0') usage("invalid argument to option 'v'"); + version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); switch (i) { - case 1: version = UUID_MAKE_V1; break; - case 3: version = UUID_MAKE_V3; break; - case 4: version = UUID_MAKE_V4; break; - case 5: version = UUID_MAKE_V5; break; + case 1: version |= UUID_MAKE_V1; break; + case 3: version |= UUID_MAKE_V3; break; + case 4: version |= UUID_MAKE_V4; break; + case 5: version |= UUID_MAKE_V5; break; default: usage("invalid version on option 'v'"); break; @@ -213,10 +214,10 @@ int main(int argc, char *argv[]) } else { /* encoding */ - if ( (version == UUID_MAKE_V1 && argc != 0) - || (version == UUID_MAKE_V3 && argc != 2) - || (version == UUID_MAKE_V4 && argc != 0) - || (version == UUID_MAKE_V5 && argc != 2)) + if ( (version & UUID_MAKE_V1 && argc != 0) + || (version & UUID_MAKE_V3 && argc != 2) + || (version & UUID_MAKE_V4 && argc != 0) + || (version & UUID_MAKE_V5 && argc != 2)) usage("invalid number of arguments"); if ((rc = uuid_create(&uuid)) != UUID_RC_OK) error(1, "uuid_create: %s", uuid_error(rc)); @@ -232,7 +233,7 @@ int main(int argc, char *argv[]) if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) error(1, "uuid_load: %s", uuid_error(rc)); } - if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { + if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) error(1, "uuid_create: %s", uuid_error(rc)); if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { -- ++++++ 0003-Fix-whatis-entries.patch ++++++ From: Marco Nenciarini <[email protected]> Date: Tue, 2 Feb 2010 12:16:49 +0100 Subject: [PATCH] Fix whatis entries Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages --- uuid++.pod | 2 +- uuid.pod | 2 +- uuid_cli.pod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uuid++.pod b/uuid++.pod index 8b5a4b1..89c5efb 100644 --- a/uuid++.pod +++ b/uuid++.pod @@ -31,7 +31,7 @@ =head1 NAME -B<OSSP uuid> - B<Universally Unique Identifier> (C++ API) +B<uuid++> - B<Universally Unique Identifier> (C++ API) =head1 VERSION diff --git a/uuid.pod b/uuid.pod index 4ad3742..0179a46 100644 --- a/uuid.pod +++ b/uuid.pod @@ -31,7 +31,7 @@ =head1 NAME -B<OSSP uuid> - B<Universally Unique Identifier> +B<uuid> - B<Universally Unique Identifier> =head1 VERSION diff --git a/uuid_cli.pod b/uuid_cli.pod index ddec6bb..df9dc83 100644 --- a/uuid_cli.pod +++ b/uuid_cli.pod @@ -31,7 +31,7 @@ =head1 NAME -B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool> +B<uuid> - B<Universally Unique Identifier Command-Line Tool> =head1 VERSION -- ++++++ uuid-1.5.0_perl_vendor_install.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in @@ -255,7 +255,7 @@ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ -@if [ ".$(WITH_PERL)" = .yes ]; then \ - (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ + (cd $(S)/perl && $(MAKE) $(MFLAGS) install_vendor DESTDIR=$(DESTDIR)); \ fi -@if [ ".$(WITH_PHP)" = .yes ]; then \ (cd $(S)/php && $(MAKE) $(MFLAGS) -f Makefile.local install EXTDIR=$(prefix)/lib/php PHP=$(PHP) DESTDIR=$(DESTDIR)); \ ++++++ uuid-1.6.0_php.patch ++++++ Index: php/Makefile.local =================================================================== --- php/Makefile.local.orig 2007-01-01 19:13:30.000000000 +0100 +++ php/Makefile.local 2007-06-19 22:30:14.299778497 +0200 @@ -35,7 +35,7 @@ all: build config: @if [ ! -f ./configure ]; then $(PHP)ize 2>/dev/null; fi - @if [ ! -f ./Makefile ]; then ./configure --with-php-config=$(PHP)-config; fi + @if [ ! -f ./Makefile ]; then LDFLAGS="-L../.libs/" ./configure --with-php-config=$(PHP)-config; fi build: config @$(MAKE) $(MFLAGS) -f Makefile Index: php/config.m4 =================================================================== --- php/config.m4.orig 2007-05-19 21:26:56.000000000 +0200 +++ php/config.m4 2007-06-19 22:33:50.728987356 +0200 @@ -41,8 +41,8 @@ if test "$PHP_UUID" != "no"; then dnl avoid linking conflict with a potentially existing uuid_create(3) in libc AC_CHECK_FUNC(uuid_create,[ SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" - AC_TRY_LINK([],[], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-Bsymbolic"]) + LDFLAGS="$LDFLAGS ../.libs/libuuid.la -Wl,-Bsymbolic" + AC_TRY_LINK([],[], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS ../.libs/libuuid.la -Wl,-Bsymbolic"]) LDFLAGS="$SAVE_LDFLAGS"]) fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
