From 3a12c61f84ce1565fb22dd5dae9dfd1e4ecfc8bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 12 Mar 2007 02:53:12 +0000 Subject: [PATCH 001/104] Initialize branch EL-5 for uuid --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From c71568f04b440e544c00921be2bc5ead9793f105 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 17 Apr 2007 20:07:51 +0000 Subject: [PATCH 002/104] Fix find option order. Use fixperms macro instead of our own chmod incantation. BR ExtUtils::MakeMaker. --- uuid.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 951d5db..b4d7fb1 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -50,6 +50,7 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries +BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} @@ -144,9 +145,9 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* popd # Install the PHP module. @@ -233,6 +234,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Apr 17 2007 Steven Pritchard 1.5.1-3 +- Fix find option order. +- Use fixperms macro instead of our own chmod incantation. +- BR ExtUtils::MakeMaker. + * Thu Oct 05 2006 Christian Iseli 1.5.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From 348319630a75a47490ad166ba018624abc6550d2 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 18 Apr 2007 18:26:58 +0000 Subject: [PATCH 003/104] Fix find option order. Use fixperms macro instead of our own chmod incantation. BR ExtUtils::MakeMaker. --- uuid.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 951d5db..b4d7fb1 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -50,6 +50,7 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries +BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} @@ -144,9 +145,9 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* popd # Install the PHP module. @@ -233,6 +234,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Apr 17 2007 Steven Pritchard 1.5.1-3 +- Fix find option order. +- Use fixperms macro instead of our own chmod incantation. +- BR ExtUtils::MakeMaker. + * Thu Oct 05 2006 Christian Iseli 1.5.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From e06fa898ef72c16ed1a283ef59a626ae36168a7f Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 24 Jul 2007 23:05:41 +0000 Subject: [PATCH 004/104] Update to 1.6.0. BR Test::More. --- .cvsignore | 2 +- sources | 2 +- uuid.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 01cba6a..7de28ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -uuid-1.5.1.tar.gz +uuid-1.6.0.tar.gz diff --git a/sources b/sources index f8c6754..21143dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7df0c4cb02dad7ce3e1ec8fc669f724 uuid-1.5.1.tar.gz +752cae29ed7d7460a6ab770e850bcb5d uuid-1.6.0.tar.gz diff --git a/uuid.spec b/uuid.spec index b4d7fb1..d77484f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -51,6 +51,7 @@ C++ development headers and libraries for OSSP uuid. Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} @@ -234,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jul 24 2007 Steven Pritchard 1.6.0-1 +- Update to 1.6.0. +- BR Test::More. + * Tue Apr 17 2007 Steven Pritchard 1.5.1-3 - Fix find option order. - Use fixperms macro instead of our own chmod incantation. From a7e72593f5ba25e11133cc62e432cabfaea90acb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Aug 2007 05:54:57 +0000 Subject: [PATCH 005/104] - Rebuild for selinux ppc32 issue. --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index d77484f..efd08b5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 +- Rebuild for selinux ppc32 issue. + * Tue Jul 24 2007 Steven Pritchard 1.6.0-1 - Update to 1.6.0. - BR Test::More. From add972235cc44c8a80c92d9430ad9456011b4479 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 03:13:04 +0000 Subject: [PATCH 006/104] - Autorebuild for GCC 4.3 --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index efd08b5..fab3b96 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.6.0-3 +- Autorebuild for GCC 4.3 + * Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 - Rebuild for selinux ppc32 issue. From ff78d000b39f929d586eb8ac3919615aacc4e261 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 6 Mar 2008 15:18:26 +0000 Subject: [PATCH 007/104] new perl --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index fab3b96..474ca8d 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.6.0-3 - Autorebuild for GCC 4.3 From af65830d5b0df3050e3f42c20dcc585b92bda3a8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 6 Mar 2008 17:30:14 +0000 Subject: [PATCH 008/104] new perl --- .cvsignore | 2 +- sources | 2 +- uuid.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7de28ec..f6f6a31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -uuid-1.6.0.tar.gz +uuid-1.6.1.tar.gz diff --git a/sources b/sources index 21143dd..e5bff6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -752cae29ed7d7460a6ab770e850bcb5d uuid-1.6.0.tar.gz +18c8875411da07fe4503fdfc2136bf46 uuid-1.6.1.tar.gz diff --git a/uuid.spec b/uuid.spec index 474ca8d..af055a7 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,14 +1,14 @@ Name: uuid -Version: 1.6.0 -Release: 4%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz -Patch0: ossp-uuid.patch +Patch0: uuid-1.6.1-ossp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: /usr/bin/libtool +BuildRequires: libtool %description OSSP uuid is a ISO-C:1999 application programming interface (API) @@ -61,7 +61,7 @@ Perl OSSP uuid modules, which includes a Data::UUID replacement. %package php Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries -BuildRequires: /usr/bin/phpize +BuildRequires: php-devel Requires: %{_libdir}/php/modules Requires: %{name} = %{version}-%{release} @@ -71,7 +71,7 @@ PHP OSSP uuid module. %package pgsql Summary: PostgreSQL support for Universally Unique Identifier library Group: Development/Libraries -BuildRequires: /usr/bin/pg_config +BuildRequires: postgresql-devel Requires: %{_libdir}/pgsql Requires: %{_datadir}/pgsql Requires: %{name} = %{version}-%{release} @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 +- 1.6.1 + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 - rebuild for new perl From 382fe71e01c9bdf031a084b69cf06fdc1bfe878f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 6 Mar 2008 17:50:23 +0000 Subject: [PATCH 009/104] cvs add missing patch --- uuid-1.6.1-ossp.patch | 207 ++++++++++++++++++++++++++++++++++++++++++ uuid.spec | 5 +- 2 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.1-ossp.patch diff --git a/uuid-1.6.1-ossp.patch b/uuid-1.6.1-ossp.patch new file mode 100644 index 0000000..c0c7d57 --- /dev/null +++ b/uuid-1.6.1-ossp.patch @@ -0,0 +1,207 @@ +diff -up uuid-1.6.1/uuid-config.in.BAD uuid-1.6.1/uuid-config.in +--- uuid-1.6.1/uuid-config.in.BAD 2008-03-06 11:56:13.000000000 -0500 ++++ uuid-1.6.1/uuid-config.in 2008-03-06 11:56:25.000000000 -0500 +@@ -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 -up uuid-1.6.1/Makefile.in.BAD uuid-1.6.1/Makefile.in +--- uuid-1.6.1/Makefile.in.BAD 2008-03-06 11:10:13.000000000 -0500 ++++ uuid-1.6.1/Makefile.in 2008-03-06 11:11:39.000000000 -0500 +@@ -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 +@@ -79,10 +79,10 @@ MAN_NAME = uuid.3 uuid++.3 uuid.1 + PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm + PERL_OBJS = $(S)/perl/uuid.pm + +-PHP_NAME = $(S)/php/modules/uuid.so ++PHP_NAME = $(S)/php/modules/ossp-uuid.so + PHP_OBJS = $(S)/php/uuid.c + +-PGSQL_NAME = $(S)/pgsql/libuuid.so ++PGSQL_NAME = $(S)/pgsql/libossp-uuid.so + PGSQL_OBJS = $(S)/pgsql/uuid.c + + TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@ +@@ -231,7 +231,7 @@ install: + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ +- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ + -@if [ ".$(WITH_DCE)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ +@@ -241,7 +241,7 @@ install: + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ + fi +- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ +@@ -276,7 +276,7 @@ uninstall: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \ + fi +- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3 ++ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \ + $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \ +@@ -290,7 +290,7 @@ uninstall: + echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \ + $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \ + fi +- -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc ++ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1 + -$(RM) $(DESTDIR)$(bindir)/uuid-config + -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) +diff -up uuid-1.6.1/pgsql/Makefile.BAD uuid-1.6.1/pgsql/Makefile +--- uuid-1.6.1/pgsql/Makefile.BAD 2008-03-06 11:53:26.000000000 -0500 ++++ uuid-1.6.1/pgsql/Makefile 2008-03-06 11:54:14.000000000 -0500 +@@ -18,13 +18,13 @@ POSTGRES := $(shell $(PG_CONFIG + top_builddir := $(dir $(PGXS))../.. + include $(top_builddir)/src/Makefile.global + +-NAME = uuid ++NAME = ossp-uuid + OBJS = uuid.o + SO_MAJOR_VERSION = 1 + SO_MINOR_VERSION = 0 + + override CPPFLAGS := -I.. $(CPPFLAGS) +-SHLIB_LINK := -L../.libs -luuid ++SHLIB_LINK := -L../.libs -lossp-uuid + SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic") + SHLIB_LINK += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)") + rpath := +@@ -35,16 +35,16 @@ enable_shared = yes + include $(top_builddir)/src/Makefile.shlib + + uuid.sql: uuid.sql.in +- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql ++ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql + + install: all + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(datadir) +- $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql + + uninstall: +- -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + -rm -f $(DESTDIR)$(datadir)/uuid.sql + + clean distclean: clean-lib +diff -up uuid-1.6.1/uuid.pc.in.BAD uuid-1.6.1/uuid.pc.in +--- uuid-1.6.1/uuid.pc.in.BAD 2008-03-06 11:57:29.000000000 -0500 ++++ uuid-1.6.1/uuid.pc.in 2008-03-06 11:57:36.000000000 -0500 +@@ -37,6 +37,6 @@ Description: Universally Unique Identifi + Version: @UUID_VERSION_RAW@ + URL: http://www.ossp.org/pkg/lib/uuid/ + Cflags: -I${includedir} +-Libs: -L${libdir} -luuid ++Libs: -L${libdir} -lossp-uuid + Libs.private: @LIBS@ + +diff -up uuid-1.6.1/perl/Makefile.PL.BAD uuid-1.6.1/perl/Makefile.PL +--- uuid-1.6.1/perl/Makefile.PL.BAD 2008-03-06 11:12:05.000000000 -0500 ++++ uuid-1.6.1/perl/Makefile.PL 2008-03-06 11:49:25.000000000 -0500 +@@ -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,7 +47,7 @@ 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', +diff -up uuid-1.6.1/Makefile.PL.BAD uuid-1.6.1/Makefile.PL +--- uuid-1.6.1/Makefile.PL.BAD 2008-03-06 11:09:49.000000000 -0500 ++++ uuid-1.6.1/Makefile.PL 2008-03-06 11:10:01.000000000 -0500 +@@ -44,7 +44,7 @@ ARGS = $ARGS + all pure_all: + \@if [ ! -d build ]; then mkdir build; fi + \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi +- \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi ++ \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi + \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi + \@cd perl && \$(MAKE) \$(MFLAGS) \$\@ + +diff -up uuid-1.6.1/php/config.m4.BAD uuid-1.6.1/php/config.m4 +--- uuid-1.6.1/php/config.m4.BAD 2008-03-06 11:54:55.000000000 -0500 ++++ uuid-1.6.1/php/config.m4 2008-03-06 11:55:07.000000000 -0500 +@@ -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 -up uuid-1.6.1/php/Makefile.local.BAD uuid-1.6.1/php/Makefile.local +--- uuid-1.6.1/php/Makefile.local.BAD 2008-03-06 11:54:39.000000000 -0500 ++++ uuid-1.6.1/php/Makefile.local 2008-03-06 11:54:49.000000000 -0500 +@@ -48,7 +48,7 @@ install: build + @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ + echo "installing PHP$$version API into $$extdir"; \ + ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \ +- ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \ ++ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \ + ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php + + clean: +diff -up uuid-1.6.1/php/uuid.ts.BAD uuid-1.6.1/php/uuid.ts +--- uuid-1.6.1/php/uuid.ts.BAD 2008-03-06 11:55:38.000000000 -0500 ++++ uuid-1.6.1/php/uuid.ts 2008-03-06 11:56:03.000000000 -0500 +@@ -34,9 +34,9 @@ + + $php_version = $argv[1]; + +-print "++ loading DSO uuid.so (low-level API)\n"; ++print "++ loading DSO ossp-uuid.so (low-level API)\n"; + if (!extension_loaded('uuid')) { +- dl('modules/uuid.so'); ++ dl('modules/ossp-uuid.so'); + } + + print "++ loading PHP uuid.php${php_version} (high-level API)\n"; diff --git a/uuid.spec b/uuid.spec index af055a7..8bc280d 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 +- forgot to cvs add patch + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 - 1.6.1 From bcaed99e6f93142b5121c2d386d2bc67e75307bc Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 7 Mar 2008 02:22:59 +0000 Subject: [PATCH 010/104] new perl --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 8bc280d..2465e19 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 +Rebuild for new perl + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 - forgot to cvs add patch From aa45e25056ab1b02cbbfbcf9c28b35ac486a0c8c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:40:53 +0000 Subject: [PATCH 011/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 2465e19..6138620 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 Rebuild for new perl From dcf4b9eae578653181fe7817f68afca8b89e9e01 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 4 May 2009 18:10:35 +0000 Subject: [PATCH 012/104] - Replace expensive %{_libdir}/pkgconfig dependency in uuid-devel with pkgconfig%{_isa} for Fedora >= 11 (#484849). --- uuid.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/uuid.spec b/uuid.spec index 6138620..5d0b95b 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -24,7 +24,11 @@ and Perl Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library Group: Development/Libraries +%if 0%{?fedora} > 10 +Requires: pkgconfig%{_isa} +%else Requires: %{_libdir}/pkgconfig +%endif Requires: %{name} = %{version}-%{release} %description devel @@ -235,11 +239,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon May 4 2009 Michael Schwendt - 1.6.1-5 +- Replace expensive %%{_libdir}/pkgconfig dependency in uuid-devel + with pkgconfig%%{_isa} for Fedora >= 11 (#484849). + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 -Rebuild for new perl +- Rebuild for new perl * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 - forgot to cvs add patch From 9d61cadd4024cefa8b6daceaa5da2b69e38e4181 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 7 May 2009 15:30:48 +0000 Subject: [PATCH 013/104] - Using plain old "Requires: pkgconfig" instead -- see my post to fedora-devel-list made today. --- uuid.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/uuid.spec b/uuid.spec index 5d0b95b..71bd31e 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -24,11 +24,7 @@ and Perl Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library Group: Development/Libraries -%if 0%{?fedora} > 10 -Requires: pkgconfig%{_isa} -%else -Requires: %{_libdir}/pkgconfig -%endif +Requires: pkgconfig Requires: %{name} = %{version}-%{release} %description devel @@ -239,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu May 7 2009 Michael Schwendt - 1.6.1-6 +- Using plain old "Requires: pkgconfig" instead -- see my post to + fedora-devel-list made today. + * Mon May 4 2009 Michael Schwendt - 1.6.1-5 - Replace expensive %%{_libdir}/pkgconfig dependency in uuid-devel with pkgconfig%%{_isa} for Fedora >= 11 (#484849). From b520bc1a18eaebc39ebc4a87f157046fc0cce758 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jul 2009 18:35:02 +0000 Subject: [PATCH 014/104] PHP 5.3.0 build - Bug #511115 --- uuid.spec | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/uuid.spec b/uuid.spec index 71bd31e..d67a9e3 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,9 @@ +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) + Name: uuid Version: 1.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -62,8 +65,13 @@ Perl OSSP uuid modules, which includes a Data::UUID replacement. Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: php-devel -Requires: %{_libdir}/php/modules Requires: %{name} = %{version}-%{release} +%if 0%{?php_zend_api} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +Requires: php-api = %{php_apiver} +%endif %description php PHP OSSP uuid module. @@ -126,11 +134,11 @@ popd # Build the PHP module. pushd php +export PHP_RPATH=no phpize CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" %configure --enable-uuid -sed -i -e '/^LDFLAGS =/s/-Wl,-rpath,[^[:space:]]*//' Makefile -make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} +make %{?_smp_mflags} popd %install @@ -154,9 +162,18 @@ popd # Install the PHP module. pushd php make install INSTALL_ROOT=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a +rm -f $RPM_BUILD_ROOT%{php_extdir}/*.a popd +# Put the php config bit into place +%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini +; Enable %{name} extension module +extension=%{name}.so +__EOF__ + + + %check make check @@ -218,7 +235,8 @@ rm -rf $RPM_BUILD_ROOT %files php %defattr(-,root,root,-) -%{_libdir}/php/modules/* +%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%{php_extdir}/%{name}.so %files pgsql %defattr(-,root,root,-) @@ -235,6 +253,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Jul 13 2009 Remi Collet - 1.6.1-7 +- rebuild for new PHP 5.3.0 ABI (20090626) +- add PHP ABI check +- use php_extdir +- add php configuration file (/etc/php.d/uuid.ini) + * Thu May 7 2009 Michael Schwendt - 1.6.1-6 - Using plain old "Requires: pkgconfig" instead -- see my post to fedora-devel-list made today. From ad8282b61ae2ba5bf4174e556ca9d7ad13d22bed Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:41:51 +0000 Subject: [PATCH 015/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index d67a9e3..2c704e9 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jul 13 2009 Remi Collet - 1.6.1-7 - rebuild for new PHP 5.3.0 ABI (20090626) - add PHP ABI check From 31a889ee13a973b176c97e18d9f4d16911f9c0b4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:48 +0000 Subject: [PATCH 016/104] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 649f88d..53a50dc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := uuid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1e81d645e333c7d5309177fc6958a62933e89120 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:54 +0000 Subject: [PATCH 017/104] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 649f88d..53a50dc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := uuid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0ee36c654b489f0fc48d104cd5b1deb0755db76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Mon, 7 Dec 2009 00:53:32 +0000 Subject: [PATCH 018/104] - rebuild against perl 5.10.1 --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 2c704e9..5566d26 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Dec 7 2009 Stepan Kasal - 1.6.1-9 +- rebuild against perl 5.10.1 + * Sun Jul 26 2009 Fedora Release Engineering - 1.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cfd2c9c755a52fa196186cccb0bb5da1123a465f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Mon, 1 Feb 2010 16:39:12 +0000 Subject: [PATCH 019/104] - silence rpmlint by using $(pwd) instead of shell variable RPM_SOURCE_DIR --- uuid.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 5566d26..5c9e7c8 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -113,8 +113,8 @@ DCE development headers and libraries for OSSP uuid. export LIB_NAME=libossp-uuid.la export DCE_NAME=libossp-uuid_dce.la export CXX_NAME=libossp-uuid++.la -export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so -export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so +export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so +export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so %configure \ --disable-static \ --without-perl \ @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Feb 1 2010 Stepan Kasal - 1.6.1-10 +- silence rpmlint by using $(pwd) instead of shell variable RPM_SOURCE_DIR + * Mon Dec 7 2009 Stepan Kasal - 1.6.1-9 - rebuild against perl 5.10.1 From 87e93354417fb7d4f6589a3440a4f6ccd65d55fd Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 21 Apr 2010 14:15:10 +0000 Subject: [PATCH 020/104] - updated to 1.6.2 - uuid-config man page moved to sub-package containing uuid-config (#562838) --- .cvsignore | 2 +- sources | 2 +- uuid.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f6f6a31..4ffb8fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -uuid-1.6.1.tar.gz +uuid-1.6.2.tar.gz diff --git a/sources b/sources index e5bff6f..e8a6f34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18c8875411da07fe4503fdfc2136bf46 uuid-1.6.1.tar.gz +5db0d43a9022a6ebbbc25337ae28942f uuid-1.6.2.tar.gz diff --git a/uuid.spec b/uuid.spec index 5c9e7c8..1403ad3 100644 --- a/uuid.spec +++ b/uuid.spec @@ -2,8 +2,8 @@ %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) Name: uuid -Version: 1.6.1 -Release: 10%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -80,7 +80,7 @@ PHP OSSP uuid module. Summary: PostgreSQL support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: postgresql-devel -Requires: %{_libdir}/pgsql +Requires: postgresql%{_isa} Requires: %{_datadir}/pgsql Requires: %{name} = %{version}-%{release} @@ -206,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/uuid %{_libdir}/libossp-uuid.so.* %{_mandir}/man1/* +%exclude %{_mandir}/man1/uuid-config.* %files devel %defattr(-,root,root,-) @@ -214,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid.so %{_libdir}/pkgconfig/ossp-uuid.pc %{_mandir}/man3/ossp-uuid.3* +%{_mandir}/man1/uuid-config.* %files c++ %defattr(-,root,root,-) @@ -253,6 +255,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Apr 21 2010 Michal Hlavinka - 1.6.2-1 +- updated to 1.6.2 +- uuid-config man page moved to sub-package containing uuid-config (#562838) + * Mon Feb 1 2010 Stepan Kasal - 1.6.1-10 - silence rpmlint by using $(pwd) instead of shell variable RPM_SOURCE_DIR From ca35696a091995efad99f90fe726de9dab2fff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 2 Jun 2010 08:54:36 +0000 Subject: [PATCH 021/104] - Mass rebuild with perl-5.12.0 --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 1403ad3..ce813c4 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Jun 02 2010 Marcela Maslanova - 1.6.2-2 +- Mass rebuild with perl-5.12.0 + * Wed Apr 21 2010 Michal Hlavinka - 1.6.2-1 - updated to 1.6.2 - uuid-config man page moved to sub-package containing uuid-config (#562838) From e993ac0e23babfb4615cd001b518a16abe3deb58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:51:43 +0000 Subject: [PATCH 022/104] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 53a50dc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: uuid -# $Id$ -NAME := uuid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 2cb3304e4922a696ceb8539d65ee38af4554f3df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:51:44 +0000 Subject: [PATCH 023/104] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 53a50dc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: uuid -# $Id$ -NAME := uuid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 05278c73e501ff36e12d4122a57e8e431a09975b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:48:49 -0600 Subject: [PATCH 024/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index ce813c4..4104e1c 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jun 02 2010 Marcela Maslanova - 1.6.2-2 - Mass rebuild with perl-5.12.0 From b86986646795127ac57bd1fde6bed7c8ddcb81f2 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 3 Mar 2011 17:56:59 +0100 Subject: [PATCH 025/104] fix build problems --- uuid-1.6.1-mkdir.patch | 11 +++++++++++ uuid.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.1-mkdir.patch diff --git a/uuid-1.6.1-mkdir.patch b/uuid-1.6.1-mkdir.patch new file mode 100644 index 0000000..89e230c --- /dev/null +++ b/uuid-1.6.1-mkdir.patch @@ -0,0 +1,11 @@ +diff -up uuid-1.6.2/pgsql/Makefile.mkdir uuid-1.6.2/pgsql/Makefile +--- uuid-1.6.2/pgsql/Makefile.mkdir 2011-03-03 15:12:12.000000000 +0000 ++++ uuid-1.6.2/pgsql/Makefile 2011-03-03 16:15:45.000000000 +0000 +@@ -16,6 +16,7 @@ PG_CONFIG ?= pg_config + PGXS := $(shell $(PG_CONFIG) --pgxs) + POSTGRES := $(shell $(PG_CONFIG) --bindir)/postgres + top_builddir := $(dir $(PGXS))../.. ++mkinstalldirs = ../shtool mkdir -p + include $(top_builddir)/src/Makefile.global + + NAME = ossp-uuid diff --git a/uuid.spec b/uuid.spec index 4104e1c..a004bfd 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,13 +3,15 @@ Name: uuid Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz Patch0: uuid-1.6.1-ossp.patch +Patch1: uuid-1.6.1-mkdir.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -107,6 +109,7 @@ DCE development headers and libraries for OSSP uuid. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # Build the library. @@ -255,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 03 2011 Karsten Hopp 1.6.2-4 +- fix build + * Mon Feb 07 2011 Fedora Release Engineering - 1.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 32e26a3e4eab08e5925d2d6b6f1f10c4cacf009b Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Sat, 14 May 2011 10:02:11 +0200 Subject: [PATCH 026/104] fix php_zend_api check --- uuid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uuid.spec b/uuid.spec index a004bfd..122bfbe 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -68,7 +68,7 @@ Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: php-devel Requires: %{name} = %{version}-%{release} -%if 0%{?php_zend_api} +%if 0%{?php_zend_api:1} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else @@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sat May 14 2011 Iain Arnell 1.6.2-5 +- fix php_zend_api check + * Thu Mar 03 2011 Karsten Hopp 1.6.2-4 - fix build From a160079c08430e0c78dc4c77a2dac26fd8339d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 17 Jun 2011 16:39:16 +0200 Subject: [PATCH 027/104] Perl mass rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 122bfbe..ce9fd03 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jun 17 2011 Marcela Mašláňová - 1.6.2-6 +- Perl mass rebuild + * Sat May 14 2011 Iain Arnell 1.6.2-5 - fix php_zend_api check From 98d9d6db56cc31ccc3a66f25dac99493ff631472 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:42:26 -0600 Subject: [PATCH 028/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index ce9fd03..6a15d7f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -3,7 +3,7 @@ Name: uuid Version: 1.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 17 2011 Marcela Mašláňová - 1.6.2-6 - Perl mass rebuild From 3a95c26209e20a135df6abb0ebce674ac6f91180 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 20 Jan 2012 19:34:04 +0100 Subject: [PATCH 029/104] PHP 5.4.0 Build --- uuid-1.6.2-php54.patch | 12 ++++++++++++ uuid.spec | 18 +++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.2-php54.patch diff --git a/uuid-1.6.2-php54.patch b/uuid-1.6.2-php54.patch new file mode 100644 index 0000000..e0281a8 --- /dev/null +++ b/uuid-1.6.2-php54.patch @@ -0,0 +1,12 @@ +diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c +--- uuid-1.6.2/php/uuid.c.php54 2011-12-27 17:23:00.948400710 +0100 ++++ uuid-1.6.2/php/uuid.c 2011-12-27 17:23:16.668401029 +0100 +@@ -496,7 +496,7 @@ PHP_FUNCTION(uuid_version) + } + + /* module function table */ +-static function_entry uuid_functions[] = { ++static zend_function_entry uuid_functions[] = { + PHP_FE(uuid_create, NULL) + PHP_FE(uuid_destroy, NULL) + PHP_FE(uuid_clone, NULL) diff --git a/uuid.spec b/uuid.spec index 6a15d7f..202a075 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,9 +1,16 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +# Private libraries are not be exposed globally by RPM +# RPM 4.8 +%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} +%{?filter_setup} +# RPM 4.9 +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ + Name: uuid Version: 1.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -11,6 +18,7 @@ URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz Patch0: uuid-1.6.1-ossp.patch Patch1: uuid-1.6.1-mkdir.patch +Patch2: uuid-1.6.2-php54.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -110,6 +118,7 @@ DCE development headers and libraries for OSSP uuid. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .php54 %build # Build the library. @@ -187,6 +196,8 @@ popd pushd php LD_LIBRARY_PATH=../.libs make test popd +# Simple extension load test (no test run in make test) +LD_LIBRARY_PATH=.libs php -n -d extension_dir=php/modules -d extension=uuid.so -m | grep uuid %clean rm -rf $RPM_BUILD_ROOT @@ -258,6 +269,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jan 19 2012 Remi Collet - 1.6.2-8 +- build against php 5.4, with patch +- add filter_provides to avoid private-shared-object-provides shout.so +- add minimal %%check for php extension + * Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 8452c8b2b944b3d74c682829128dd6860763c1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 8 Jun 2012 16:02:45 +0200 Subject: [PATCH 030/104] Perl 5.16 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 202a075..ce05221 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jun 08 2012 Petr Pisar - 1.6.2-9 +- Perl 5.16 rebuild + * Thu Jan 19 2012 Remi Collet - 1.6.2-8 - build against php 5.4, with patch - add filter_provides to avoid private-shared-object-provides shout.so From d306e5a2a5c00636c9f986dda97f711566d69835 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 19 Jun 2012 11:48:16 +0200 Subject: [PATCH 031/104] fix generation of MAC address based uuids (#829532), patch by Philip Prindeville --- uuid-1.6.2-hwaddr.patch | 116 ++++++++++++++++++++++++++++++++++++++++ uuid.spec | 10 +++- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.2-hwaddr.patch diff --git a/uuid-1.6.2-hwaddr.patch b/uuid-1.6.2-hwaddr.patch new file mode 100644 index 0000000..0adc837 --- /dev/null +++ b/uuid-1.6.2-hwaddr.patch @@ -0,0 +1,116 @@ +diff -urN uuid-1.6.2/configure uuid-1.6.2/configure +--- uuid-1.6.2/configure 2008-07-04 15:43:09.000000000 -0600 ++++ uuid-1.6.2/configure 2012-06-06 19:19:41.659880386 -0600 +@@ -14208,7 +14208,7 @@ + + + +-for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h ++for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c +--- uuid-1.6.2/uuid.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid.c 2012-06-06 15:50:30.060881473 -0600 +@@ -72,6 +72,8 @@ + /* IEEE 802 MAC address octet length */ + #define IEEE_MAC_OCTETS 6 + ++static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00}; ++ + /* UUID binary representation according to UUID standards */ + typedef struct { + uuid_uint32_t time_low; /* bits 0-31 of time field */ +@@ -967,7 +969,7 @@ + * GENERATE NODE + */ + +- if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) { ++ if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) { + /* generate random IEEE 802 local multicast MAC address */ + if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK) + return UUID_RC_INT; +diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c +--- uuid-1.6.2/uuid_mac.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid_mac.c 2012-06-06 19:30:49.050879930 -0600 +@@ -76,6 +76,9 @@ + #ifdef HAVE_IFADDRS_H + #include + #endif ++#ifdef HAVE_NETPACKET_PACKET_H ++#include ++#endif + + /* own headers (part (1/2) */ + #include "uuid_mac.h" +@@ -87,6 +90,10 @@ + #define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/) + #endif + ++#if !defined(min) ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ + /* return the Media Access Control (MAC) address of + the FIRST network interface card (NIC) */ + int mac_address(unsigned char *data_ptr, size_t data_len) +@@ -95,28 +102,41 @@ + if (data_ptr == NULL || data_len < MAC_LEN) + return FALSE; + +-#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS) ++#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS) + /* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */ + { + struct ifaddrs *ifap; + struct ifaddrs *ifap_head; ++#if defined(HAVE_NET_IF_DL_H) + const struct sockaddr_dl *sdl; + unsigned char *ucp; +- int i; ++#else ++ const struct sockaddr_ll *sll; ++#endif + + if (getifaddrs(&ifap_head) < 0) + return FALSE; + for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) { ++#if defined(HAVE_NET_IF_DL_H) + if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) { + sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr; + ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen); + if (sdl->sdl_alen > 0) { +- for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++) +- data_ptr[i] = (unsigned char)(*ucp & 0xff); ++ memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN)); + freeifaddrs(ifap_head); + return TRUE; + } + } ++#else ++ if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) { ++ sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr; ++ if (sll->sll_hatype == ARPHRD_ETHER) { ++ memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN)); ++ freeifaddrs(ifap_head); ++ return TRUE; ++ } ++ } ++#endif + } + freeifaddrs(ifap_head); + } +diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in +--- uuid-1.6.2/config.h.in 2008-07-04 15:43:10.000000000 -0600 ++++ uuid-1.6.2/config.h.in 2012-06-06 21:59:03.370227352 -0600 +@@ -75,6 +75,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_NETINET_IN_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NETPACKET_PACKET_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_NET_IF_ARP_H + diff --git a/uuid.spec b/uuid.spec index ce05221..981ed33 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -20,6 +20,9 @@ Patch0: uuid-1.6.1-ossp.patch Patch1: uuid-1.6.1-mkdir.patch Patch2: uuid-1.6.2-php54.patch +# rhbz#829532 +Patch3: uuid-1.6.2-hwaddr.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -119,6 +122,7 @@ DCE development headers and libraries for OSSP uuid. %patch0 -p1 %patch1 -p1 %patch2 -p1 -b .php54 +%patch3 -p1 -b .hwaddr %build # Build the library. @@ -269,6 +273,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-10 +- fix generation of MAC address based uuids (#829532), + patch by Philip Prindeville + * Fri Jun 08 2012 Petr Pisar - 1.6.2-9 - Perl 5.16 rebuild From e3a663408a4f43d15bee4ba1dc60ca9804a44910 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 19 Jun 2012 13:41:25 +0200 Subject: [PATCH 032/104] fix debuginfo --- uuid-1.6.2-nostrip.patch | 12 ++++++++++++ uuid.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.2-nostrip.patch diff --git a/uuid-1.6.2-nostrip.patch b/uuid-1.6.2-nostrip.patch new file mode 100644 index 0000000..9234e22 --- /dev/null +++ b/uuid-1.6.2-nostrip.patch @@ -0,0 +1,12 @@ +diff -up uuid-1.6.2/Makefile.in.nostrip uuid-1.6.2/Makefile.in +--- uuid-1.6.2/Makefile.in.nostrip 2012-06-19 12:53:47.888028956 +0200 ++++ uuid-1.6.2/Makefile.in 2012-06-19 12:53:47.913029142 +0200 +@@ -253,7 +253,7 @@ install: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ + fi +- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ ++ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -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)); \ diff --git a/uuid.spec b/uuid.spec index 981ed33..67601c2 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -23,6 +23,9 @@ Patch2: uuid-1.6.2-php54.patch # rhbz#829532 Patch3: uuid-1.6.2-hwaddr.patch +# do not strip binaries +Patch4: uuid-1.6.2-nostrip.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -123,6 +126,7 @@ DCE development headers and libraries for OSSP uuid. %patch1 -p1 %patch2 -p1 -b .php54 %patch3 -p1 -b .hwaddr +%patch4 -p1 -b .nostrip %build # Build the library. @@ -273,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-11 +- fix debuginfo + * Tue Jun 19 2012 Michal Hlavinka - 1.6.2-10 - fix generation of MAC address based uuids (#829532), patch by Philip Prindeville From 6d7ae7f1dd03dd751de50ef86444f54a3c38a6b5 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 19 Jun 2012 15:04:13 +0200 Subject: [PATCH 033/104] enforce usage of our c(xx)flags --- uuid.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 67601c2..739c039 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -135,6 +135,8 @@ export DCE_NAME=libossp-uuid_dce.la export CXX_NAME=libossp-uuid++.la export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --disable-static \ --without-perl \ @@ -143,7 +145,7 @@ export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so --with-cxx \ --with-pgsql -make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} +make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} # Build the Perl module. pushd perl @@ -158,7 +160,7 @@ export PHP_RPATH=no phpize CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" %configure --enable-uuid -make %{?_smp_mflags} +make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} popd %install @@ -277,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-12 +- enforce usage of our c(xx)flags + * Tue Jun 19 2012 Michal Hlavinka - 1.6.2-11 - fix debuginfo From 08be0b43c1668600e186b19035e770fb7c494661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Jun 2012 14:37:53 +0200 Subject: [PATCH 034/104] Perl 5.16 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 739c039..6843be3 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -279,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jun 28 2012 Petr Pisar - 1.6.2-13 +- Perl 5.16 rebuild + * Tue Jun 19 2012 Michal Hlavinka - 1.6.2-12 - enforce usage of our c(xx)flags From 82384834ce19febe23d3eaf775b11d97ac8b3697 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:17:52 -0500 Subject: [PATCH 035/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 6843be3..78d439a 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -279,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.6.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jun 28 2012 Petr Pisar - 1.6.2-13 - Perl 5.16 rebuild From cf68ca40123e3cd4c68984ac4eb1e7ae68e95fbc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 6 Nov 2012 16:16:40 +0100 Subject: [PATCH 036/104] make uuid-php compatible with php 5.4 (#873594) --- uuid-1.6.2-php54.patch | 226 +++++++++++++++++++++++++++++++++++++++-- uuid.spec | 5 +- 2 files changed, 224 insertions(+), 7 deletions(-) diff --git a/uuid-1.6.2-php54.patch b/uuid-1.6.2-php54.patch index e0281a8..206b342 100644 --- a/uuid-1.6.2-php54.patch +++ b/uuid-1.6.2-php54.patch @@ -1,12 +1,226 @@ diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c ---- uuid-1.6.2/php/uuid.c.php54 2011-12-27 17:23:00.948400710 +0100 -+++ uuid-1.6.2/php/uuid.c 2011-12-27 17:23:16.668401029 +0100 -@@ -496,7 +496,7 @@ PHP_FUNCTION(uuid_version) +--- uuid-1.6.2/php/uuid.c.php54 2007-01-01 19:35:57.000000000 +0100 ++++ uuid-1.6.2/php/uuid.c 2012-11-06 16:05:03.354913764 +0100 +@@ -60,7 +60,7 @@ static int ctx_id; /* inte + #define ctx_name "UUID context" /* external name */ + + /* module initialization */ +-PHP_MINIT_FUNCTION(uuid) ++ZEND_MINIT_FUNCTION(uuid) + { + /* register resource identifier */ + ctx_id = zend_register_list_destructors_ex( +@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid) } + /* module shutdown */ +-PHP_MSHUTDOWN_FUNCTION(uuid) ++ZEND_MSHUTDOWN_FUNCTION(uuid) + { + return SUCCESS; + } + + /* module information */ +-PHP_MINFO_FUNCTION(uuid) ++ZEND_MINFO_FUNCTION(uuid) + { + char version[32]; + +@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid) + proto rc uuid_create(ctx) + $rc = uuid_create(&$uuid); + create UUID context */ +-PHP_FUNCTION(uuid_create) ++ZEND_FUNCTION(uuid_create) + { + zval *z_ctx; + ctx_t *ctx; +@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create) + proto rc uuid_destroy(ctx) + $rc = uuid_destroy($uuid); + destroy UUID context */ +-PHP_FUNCTION(uuid_destroy) ++ZEND_FUNCTION(uuid_destroy) + { + zval *z_ctx; + ctx_t *ctx; +@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy) + proto rc uuid_clone(ctx, &ctx2) + $rc = uuid_clone($uuid, &$uuid); + clone UUID context */ +-PHP_FUNCTION(uuid_clone) ++ZEND_FUNCTION(uuid_clone) + { + zval *z_ctx; + ctx_t *ctx; +@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone) + proto rc uuid_load(ctx, name) + $rc = uuid_name($uuid, $name); + load an existing UUID */ +-PHP_FUNCTION(uuid_load) ++ZEND_FUNCTION(uuid_load) + { + zval *z_ctx; + ctx_t *ctx; +@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load) + proto rc uuid_make(ctx, mode[, ..., ...]) + $rc = uuid_make($uuid, $mode[, ..., ...]); + make a new UUID */ +-PHP_FUNCTION(uuid_make) ++ZEND_FUNCTION(uuid_make) + { + zval *z_ctx; + ctx_t *ctx; +@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make) + proto rc uuid_isnil(ctx, result) + $rc = uuid_isnil($uuid, &$result); + compare UUID for being Nil UUID */ +-PHP_FUNCTION(uuid_isnil) ++ZEND_FUNCTION(uuid_isnil) + { + zval *z_ctx; + ctx_t *ctx; +@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil) + proto rc uuid_compare(ctx, ctx2, result) + $rc = uuid_compare($uuid, $uuid2, &$result); + compare two UUIDs */ +-PHP_FUNCTION(uuid_compare) ++ZEND_FUNCTION(uuid_compare) + { + zval *z_ctx; + ctx_t *ctx; +@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare) + proto rc uuid_import(ctx, fmt, data) + $rc = uuid_import($ctx, $fmt, $data); + import UUID from variable */ +-PHP_FUNCTION(uuid_import) ++ZEND_FUNCTION(uuid_import) + { + zval *z_ctx; + ctx_t *ctx; +@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import) + proto rc uuid_export(ctx, fmt, data) + $rc = uuid_error($ctx, $fmt, &$data); + export UUID into variable */ +-PHP_FUNCTION(uuid_export) ++ZEND_FUNCTION(uuid_export) + { + zval *z_ctx; + ctx_t *ctx; +@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export) + proto rc uuid_error(ctx) + $error = uuid_error($rc); + return error string corresponding to error return code */ +-PHP_FUNCTION(uuid_error) ++ZEND_FUNCTION(uuid_error) + { + int z_rc; + uuid_rc_t rc; +@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error) + proto int uuid_version() + $version = uuid_version(); + return library version number */ +-PHP_FUNCTION(uuid_version) ++ZEND_FUNCTION(uuid_version) + { + RETURN_LONG((long)uuid_version()); + } + ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0) ++ ZEND_ARG_INFO(1, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, ctx2) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, name) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, mode) ++ ZEND_ARG_INFO(0, ctxns) ++ ZEND_ARG_INFO(0, url) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, ctx2) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(1, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0) ++ZEND_END_ARG_INFO() ++ /* module function table */ -static function_entry uuid_functions[] = { +- PHP_FE(uuid_create, NULL) +- PHP_FE(uuid_destroy, NULL) +- PHP_FE(uuid_clone, NULL) +- PHP_FE(uuid_load, NULL) +- PHP_FE(uuid_make, NULL) +- PHP_FE(uuid_isnil, NULL) +- PHP_FE(uuid_compare, NULL) +- PHP_FE(uuid_import, NULL) +- PHP_FE(uuid_export, NULL) +- PHP_FE(uuid_error, NULL) +- PHP_FE(uuid_version, NULL) +static zend_function_entry uuid_functions[] = { - PHP_FE(uuid_create, NULL) - PHP_FE(uuid_destroy, NULL) - PHP_FE(uuid_clone, NULL) ++ ZEND_FE(uuid_create, arginfo_uuid_create) ++ ZEND_FE(uuid_destroy, NULL) ++ ZEND_FE(uuid_clone, arginfo_uuid_clone) ++ ZEND_FE(uuid_load, NULL) ++ ZEND_FE(uuid_make, NULL) ++ ZEND_FE(uuid_isnil, arginfo_uuid_isnil) ++ ZEND_FE(uuid_compare, arginfo_uuid_compare) ++ ZEND_FE(uuid_import, NULL) ++ ZEND_FE(uuid_export, arginfo_uuid_export) ++ ZEND_FE(uuid_error, NULL) ++ ZEND_FE(uuid_version, NULL) + { NULL, NULL, NULL } + }; + +@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = { + STANDARD_MODULE_HEADER, + "uuid", + uuid_functions, +- PHP_MINIT(uuid), +- PHP_MSHUTDOWN(uuid), ++ ZEND_MINIT(uuid), ++ ZEND_MSHUTDOWN(uuid), + NULL, + NULL, +- PHP_MINFO(uuid), ++ ZEND_MINFO(uuid), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES + }; diff --git a/uuid.spec b/uuid.spec index 78d439a..99614a7 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -279,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Nov 06 2012 Michal Hlavinka - 1.6.2-15 +- make uuid-php compatible with php 5.4 (#873594) + * Sun Jul 22 2012 Fedora Release Engineering - 1.6.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 95375c5910e93e9873abf3cdd7088c6d419d6f59 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:35:55 -0600 Subject: [PATCH 037/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 99614a7..0558779 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -279,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.6.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Nov 06 2012 Michal Hlavinka - 1.6.2-15 - make uuid-php compatible with php 5.4 (#873594) From 468e07f8ea3ea5350e0446fcdbc3e491b7971f2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2013 15:28:18 +0100 Subject: [PATCH 038/104] rebuild for http://fedoraproject.org/wiki/Features/Php55 --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 0558779..148be27 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -279,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Mar 22 2013 Remi Collet - 1.6.2-17 +- rebuild for http://fedoraproject.org/wiki/Features/Php55 + * Fri Feb 15 2013 Fedora Release Engineering - 1.6.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 852f701c6ea33abe2b0239a2b6e86ae3fa2ea318 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 30 May 2013 16:28:06 +0200 Subject: [PATCH 039/104] descripe -r in man page --- uuid-1.6.2-manfix.patch | 13 +++++++++++++ uuid.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 uuid-1.6.2-manfix.patch diff --git a/uuid-1.6.2-manfix.patch b/uuid-1.6.2-manfix.patch new file mode 100644 index 0000000..c191e17 --- /dev/null +++ b/uuid-1.6.2-manfix.patch @@ -0,0 +1,13 @@ +diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1 +--- uuid-1.6.2/uuid.1.manfix 2013-05-30 15:56:38.630003125 +0200 ++++ uuid-1.6.2/uuid.1 2013-05-30 16:00:57.145127756 +0200 +@@ -238,6 +238,9 @@ value representation of a \s-1UUID\s0. E + .IP "\fB\-o\fR \fIfilename\fR" 3 + .IX Item "-o filename" + Write output to \fIfilename\fR instead of to \fIstdout\fR. ++.IP "\fB\-r\fR" 3 ++.IX Item "-r" ++This is equivalent to \fB-F BIN\fR. + .IP "\fB\-d\fR" 3 + .IX Item "-d" + Decode a given \s-1UUID\s0 (given as a command line argument or if the command diff --git a/uuid.spec b/uuid.spec index 148be27..f01a050 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -25,6 +25,7 @@ Patch3: uuid-1.6.2-hwaddr.patch # do not strip binaries Patch4: uuid-1.6.2-nostrip.patch +Patch5: uuid-1.6.2-manfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -127,6 +128,7 @@ DCE development headers and libraries for OSSP uuid. %patch2 -p1 -b .php54 %patch3 -p1 -b .hwaddr %patch4 -p1 -b .nostrip +%patch5 -p1 -b .manfix %build # Build the library. @@ -279,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu May 30 2013 Michal Hlavinka - 1.6.2-18 +- descripe -r in man page + * Fri Mar 22 2013 Remi Collet - 1.6.2-17 - rebuild for http://fedoraproject.org/wiki/Features/Php55 From 026f1b608a05872b8d5d4e5f6adb1f43fe84ce23 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 30 May 2013 17:28:46 +0200 Subject: [PATCH 040/104] fix typo --- uuid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index f01a050..65a308c 100644 --- a/uuid.spec +++ b/uuid.spec @@ -282,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu May 30 2013 Michal Hlavinka - 1.6.2-18 -- descripe -r in man page +- describe -r in man page * Fri Mar 22 2013 Remi Collet - 1.6.2-17 - rebuild for http://fedoraproject.org/wiki/Features/Php55 From 82d43de48e02b1be1529ea17adbfa7268a802927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 14:43:41 +0200 Subject: [PATCH 041/104] Perl 5.18 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 65a308c..f5a9996 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -281,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Jul 17 2013 Petr Pisar - 1.6.2-19 +- Perl 5.18 rebuild + * Thu May 30 2013 Michal Hlavinka - 1.6.2-18 - describe -r in man page From 470c71d1244bab52a37e5f4cf704d0fc304e73f9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:51:14 -0500 Subject: [PATCH 042/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index f5a9996..9b649e5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -281,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 1.6.2-19 - Perl 5.18 rebuild From eaf1ca2b6f60b080df8f25b123ce1fed74726d92 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 14 Aug 2013 17:07:02 +0200 Subject: [PATCH 043/104] fix aarch64 support (#926687) --- uuid-aarch64.patch | 1588 ++++++++++++++++++++++++++++++++++++++++++++ uuid.spec | 7 +- 2 files changed, 1594 insertions(+), 1 deletion(-) create mode 100644 uuid-aarch64.patch diff --git a/uuid-aarch64.patch b/uuid-aarch64.patch new file mode 100644 index 0000000..bf6f1f5 --- /dev/null +++ b/uuid-aarch64.patch @@ -0,0 +1,1588 @@ +diff -urN uuid-1.6.2/config.guess uuid-1.6.2-aarch64/config.guess +--- uuid-1.6.2/config.guess 2008-07-04 16:43:08.000000000 -0500 ++++ uuid-1.6.2-aarch64/config.guess 2013-03-03 09:02:58.671329550 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-08' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -170,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,14 +330,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -375,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -575,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -640,7 +665,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -711,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -750,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,34 +794,39 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -806,6 +836,9 @@ + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -835,6 +868,27 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -842,20 +896,40 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -866,74 +940,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -943,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -958,78 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1037,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1058,7 +1034,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1073,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1101,10 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1139,8 +1118,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1153,7 +1142,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1173,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1202,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1216,6 +1205,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1243,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1258,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1303,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1324,11 +1332,14 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +@@ -1484,9 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN uuid-1.6.2/config.sub uuid-1.6.2-aarch64/config.sub +--- uuid-1.6.2/config.sub 2008-07-04 16:43:08.000000000 -0500 ++++ uuid-1.6.2-aarch64/config.sub 2013-03-03 09:02:58.680328512 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-16' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -120,12 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -148,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -166,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -214,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -238,24 +255,32 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,29 +293,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -300,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -314,29 +367,37 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -351,27 +412,32 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) +@@ -393,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -439,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -455,10 +525,27 @@ + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -487,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -526,6 +613,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -641,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -699,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -735,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -803,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -885,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -981,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1037,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1120,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1128,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1166,7 +1276,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1213,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1236,21 +1349,23 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1258,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1297,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1346,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1388,6 +1503,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1410,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1425,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1446,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1480,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +@@ -1585,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/uuid.spec b/uuid.spec index 9b649e5..df27bd4 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -26,6 +26,7 @@ Patch3: uuid-1.6.2-hwaddr.patch # do not strip binaries Patch4: uuid-1.6.2-nostrip.patch Patch5: uuid-1.6.2-manfix.patch +Patch6: uuid-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -129,6 +130,7 @@ DCE development headers and libraries for OSSP uuid. %patch3 -p1 -b .hwaddr %patch4 -p1 -b .nostrip %patch5 -p1 -b .manfix +%patch6 -p1 -b .aarch64 %build # Build the library. @@ -281,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Aug 14 2013 Michal Hlavinka - 1.6.2-21 +- fix aarch64 support (#926687) + * Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From f14a613352f478b6ba5ad165d859a3fa73867a35 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 12 Sep 2013 16:43:48 +0200 Subject: [PATCH 044/104] rebuild for postgresql api change --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index df27bd4..9333786 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 @@ -283,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Sep 12 2013 Michal Hlavinka - 1.6.2-22 +- rebuild for postgresql api change + * Wed Aug 14 2013 Michal Hlavinka - 1.6.2-21 - fix aarch64 support (#926687) From 11f8bc284148caddd745aed08f070d4ab4a56d3a Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 16 Sep 2013 14:34:42 +0200 Subject: [PATCH 045/104] 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 - 1.6.2-23 +- drop the perl(Data::UUID) compatibility shim and require the real thing + instead (#998591) + * Thu Sep 12 2013 Michal Hlavinka - 1.6.2-22 - rebuild for postgresql api change From 0a1b5059a2d6dccf1013561c006e69571336dbdd Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 30 Oct 2013 12:23:37 +0100 Subject: [PATCH 046/104] drop uuid-pgsql subpackage, it is outdated and does not work, use uuid-ossp module from postgresql-contrib instead --- uuid.spec | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/uuid.spec b/uuid.spec index 9333786..8addc9e 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 @@ -31,6 +31,8 @@ Patch6: uuid-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool +Obsoletes: %{name}-pgsql < 1.6.2-22 + %description OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation @@ -94,17 +96,6 @@ Requires: php-api = %{php_apiver} %description php PHP OSSP uuid module. -%package pgsql -Summary: PostgreSQL support for Universally Unique Identifier library -Group: Development/Libraries -BuildRequires: postgresql-devel -Requires: postgresql%{_isa} -Requires: %{_datadir}/pgsql -Requires: %{name} = %{version}-%{release} - -%description pgsql -PostgreSQL OSSP uuid module. - %package dce Summary: DCE support for Universally Unique Identifier library Group: Development/Libraries @@ -268,11 +259,6 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/php.d/%{name}.ini %{php_extdir}/%{name}.so -%files pgsql -%defattr(-,root,root,-) -%{_libdir}/pgsql/* -%{_datadir}/pgsql/* - %files dce %defattr(-,root,root,-) %{_libdir}/libossp-uuid_dce.so.* @@ -283,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Oct 30 2013 Michal Hlavinka - 1.6.2-23 +- drop uuid-pgsql subpackage, it is outdated and does not work, use + uuid-ossp module from postgresql-contrib instead + * Thu Sep 12 2013 Michal Hlavinka - 1.6.2-22 - rebuild for postgresql api change From e9a222f13a969a908793d1e2bab165a2d9150097 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 30 Oct 2013 13:06:08 +0100 Subject: [PATCH 047/104] disable pgsql in configure --- uuid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index e3d61cf..9a91933 100644 --- a/uuid.spec +++ b/uuid.spec @@ -140,7 +140,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" --without-php \ --with-dce \ --with-cxx \ - --with-pgsql + --without-pgsql make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} From 0ba3b8a6d817885fbc115c3c311889d3ca8d891b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:09:42 -0500 Subject: [PATCH 048/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 9a91933..8be3775 100644 --- a/uuid.spec +++ b/uuid.spec @@ -10,7 +10,7 @@ Name: uuid Version: 1.6.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.6.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Oct 30 2013 Michal Hlavinka - 1.6.2-24 - drop uuid-pgsql subpackage, it is outdated and does not work, use uuid-ossp module from postgresql-contrib instead From 68eba648864026f37c2e13dd02790e3e6ee070c5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Jun 2014 17:54:08 +0200 Subject: [PATCH 049/104] rebuild for https://fedoraproject.org/wiki/Changes/Php56 --- uuid.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/uuid.spec b/uuid.spec index 8be3775..2bafb89 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,16 +1,22 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Private libraries are not be exposed globally by RPM -# RPM 4.8 %{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} %{?filter_setup} -# RPM 4.9 +%endif + %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ +%if "%{php_version}" < "5.6" +%global ini_name %{name}.ini +%else +%global ini_name 40-%{name}.ini +%endif Name: uuid Version: 1.6.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -186,7 +192,7 @@ popd # Put the php config bit into place %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d -%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{ini_name} ; Enable %{name} extension module extension=%{name}.so __EOF__ @@ -259,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT %files php %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%config(noreplace) %{_sysconfdir}/php.d/%{ini_name} %{php_extdir}/%{name}.so %files dce @@ -272,6 +278,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jun 19 2014 Remi Collet - 1.6.2-26 +- rebuild for https://fedoraproject.org/wiki/Changes/Php56 +- add numerical prefix to PHP extension configuration file + * Sun Jun 08 2014 Fedora Release Engineering - 1.6.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 63ccc028775b337bfa6df78d7b48e519ebb7151e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:21:43 +0000 Subject: [PATCH 050/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 2bafb89..fc75bba 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.6.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jun 19 2014 Remi Collet - 1.6.2-26 - rebuild for https://fedoraproject.org/wiki/Changes/Php56 - add numerical prefix to PHP extension configuration file From f24979ffd06fec578d2873e19fb4d2c910d72479 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Aug 2014 09:06:09 +0200 Subject: [PATCH 051/104] Perl 5.20 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index fc75bba..a32af7c 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Aug 28 2014 Jitka Plesnikova - 1.6.2-28 +- Perl 5.20 rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.6.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 72d8e064b38236bd101c62ace16f106f3bc68d0f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:22:45 +0200 Subject: [PATCH 052/104] Rebuilt for GCC 5 C++11 ABI change --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index a32af7c..7068f91 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sat May 02 2015 Kalev Lember - 1.6.2-29 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Aug 28 2014 Jitka Plesnikova - 1.6.2-28 - Perl 5.20 rebuild From 215f8a5518f8b67bea1366939a5a0bd46e06ebda Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 5 Jun 2015 15:57:12 +0200 Subject: [PATCH 053/104] Perl 5.22 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 7068f91..f9159bc 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jun 05 2015 Jitka Plesnikova - 1.6.2-30 +- Perl 5.22 rebuild + * Sat May 02 2015 Kalev Lember - 1.6.2-29 - Rebuilt for GCC 5 C++11 ABI change From 9a12e6897684b3b196f55ff273ed4b06d0e43902 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:44:50 +0000 Subject: [PATCH 054/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index f9159bc..fc4c325 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 05 2015 Jitka Plesnikova - 1.6.2-30 - Perl 5.22 rebuild From 17864a68a9c25b9a78cbd4503a122566a7c82ad8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:29:38 +0000 Subject: [PATCH 055/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index fc4c325..6e82248 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.6.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5e63ecfbc73f0ae35b954d269068dc1d24c2b278 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 17:16:07 +0200 Subject: [PATCH 056/104] Perl 5.24 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 6e82248..f53b2e2 100644 --- a/uuid.spec +++ b/uuid.spec @@ -16,7 +16,7 @@ Name: uuid Version: 1.6.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sun May 15 2016 Jitka Plesnikova - 1.6.2-33 +- Perl 5.24 rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ac26b37c8e94556508ed453a1806ad4e7cf0269a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:28:40 +0200 Subject: [PATCH 057/104] Mandatory Perl build-requires added --- uuid.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uuid.spec b/uuid.spec index f53b2e2..e5e2db6 100644 --- a/uuid.spec +++ b/uuid.spec @@ -79,6 +79,8 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: perl(Data::UUID) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) From 051bd3312591beebde8231d4352a756abf7ab29e Mon Sep 17 00:00:00 2001 From: Matias Kreder Date: Thu, 1 Sep 2016 18:43:43 +0000 Subject: [PATCH 058/104] dropped uuid-php on rawhide --- uuid.spec | 72 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/uuid.spec b/uuid.spec index e5e2db6..674b775 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,22 +1,12 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) - %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Private libraries are not be exposed globally by RPM %{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} %{?filter_setup} %endif -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ -%if "%{php_version}" < "5.6" -%global ini_name %{name}.ini -%else -%global ini_name 40-%{name}.ini -%endif - Name: uuid Version: 1.6.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -46,9 +36,9 @@ 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. +API bindings are provided for the languages ISO-C++:1998 and Perl:5 +Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl +Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library @@ -91,21 +81,6 @@ Requires: perl(Data::UUID) %description perl Perl OSSP uuid module. -%package php -Summary: PHP support for Universally Unique Identifier library -Group: Development/Libraries -BuildRequires: php-devel -Requires: %{name} = %{version}-%{release} -%if 0%{?php_zend_api:1} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%else -Requires: php-api = %{php_apiver} -%endif - -%description php -PHP OSSP uuid module. - %package dce Summary: DCE support for Universally Unique Identifier library Group: Development/Libraries @@ -159,15 +134,6 @@ pushd perl make %{?_smp_mflags} popd -# Build the PHP module. -pushd php -export PHP_RPATH=no -phpize -CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" -%configure --enable-uuid -make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} -popd - %install rm -rf $RPM_BUILD_ROOT @@ -186,21 +152,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* popd -# Install the PHP module. -pushd php -make install INSTALL_ROOT=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{php_extdir}/*.a -popd - -# Put the php config bit into place -%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d -%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{ini_name} -; Enable %{name} extension module -extension=%{name}.so -__EOF__ - - - %check make check @@ -211,12 +162,6 @@ perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data:: LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts popd -pushd php -LD_LIBRARY_PATH=../.libs make test -popd -# Simple extension load test (no test run in make test) -LD_LIBRARY_PATH=.libs php -n -d extension_dir=php/modules -d extension=uuid.so -m | grep uuid - %clean rm -rf $RPM_BUILD_ROOT @@ -265,11 +210,6 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/OSSP* %{_mandir}/man3/OSSP::uuid.3* -%files php -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/php.d/%{ini_name} -%{php_extdir}/%{name}.so - %files dce %defattr(-,root,root,-) %{_libdir}/libossp-uuid_dce.so.* @@ -280,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Sep 1 2016 Matias Kreder - 1.6.2-34 +- Removed uuid-php subpackage since php(api) is no longer provided on +- PHP 7 and there is a replacement (pecl/uuid extension) + * Sun May 15 2016 Jitka Plesnikova - 1.6.2-33 - Perl 5.24 rebuild From 0228fcdf898273f80ce62b1da305ec12d9543428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:52:38 +0000 Subject: [PATCH 059/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 674b775..abed6e2 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Sep 1 2016 Matias Kreder - 1.6.2-34 - Removed uuid-php subpackage since php(api) is no longer provided on - PHP 7 and there is a replacement (pecl/uuid extension) From 6958583ba68b4edda04d0fa821836ce4f9ca7361 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 5 Jun 2017 02:36:35 +0200 Subject: [PATCH 060/104] Perl 5.26 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index abed6e2..5edf8c8 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Jun 05 2017 Jitka Plesnikova - 1.6.2-36 +- Perl 5.26 rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.6.2-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6b3ec4df19ad51920d123ce3dd8cc92c7f8f2911 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Jul 2017 13:11:45 +0200 Subject: [PATCH 061/104] Rebuild due to bug in RPM (RHBZ #1468476) Signed-off-by: Igor Gnatenko --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 5edf8c8..8061a80 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jul 07 2017 Igor Gnatenko - 1.6.2-37 +- Rebuild due to bug in RPM (RHBZ #1468476) + * Mon Jun 05 2017 Jitka Plesnikova - 1.6.2-36 - Perl 5.26 rebuild From 9f61456334e0e0b415f752943a058b58d9077cce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:07:36 +0000 Subject: [PATCH 062/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 8061a80..bf97333 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 07 2017 Igor Gnatenko - 1.6.2-37 - Rebuild due to bug in RPM (RHBZ #1468476) From 43c916caff937bdf8a97ded1abff3e01df4895f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:56:00 +0000 Subject: [PATCH 063/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index bf97333..f8e266d 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9281c2cda05ec013386df0cc05ebe38e5c3b6978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:14:06 +0000 Subject: [PATCH 064/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index f8e266d..881a402 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.6.2-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 48b46e522619d96ec0c2df61f5eef6e9e36a316b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:47:04 +0100 Subject: [PATCH 065/104] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- uuid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 881a402..1178d53 100644 --- a/uuid.spec +++ b/uuid.spec @@ -24,7 +24,6 @@ Patch4: uuid-1.6.2-nostrip.patch Patch5: uuid-1.6.2-manfix.patch Patch6: uuid-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool Obsoletes: %{name}-pgsql < 1.6.2-24 From e694da00a5c353e35aebca5364ec5aaeeeaaa0a0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:57:28 +0100 Subject: [PATCH 066/104] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- uuid.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 1178d53..adaf6ec 100644 --- a/uuid.spec +++ b/uuid.spec @@ -161,9 +161,6 @@ perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data:: LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts popd -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %post c++ -p /sbin/ldconfig From 4361b9e6f5fb92d35b941da172a82d4565440f1e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 10:20:30 +0200 Subject: [PATCH 067/104] Perl 5.28 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index adaf6ec..82dd890 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -216,6 +216,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 1.6.2-41 +- Perl 5.28 rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From abb19e68c53e0d7ae6ccff19e1d8475b94f68693 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:43:46 -0500 Subject: [PATCH 068/104] Remove needless use of %defattr --- uuid.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/uuid.spec b/uuid.spec index 82dd890..d0449a8 100644 --- a/uuid.spec +++ b/uuid.spec @@ -174,7 +174,6 @@ popd %postun dce -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS %{_bindir}/uuid %{_libdir}/libossp-uuid.so.* @@ -182,7 +181,6 @@ popd %exclude %{_mandir}/man1/uuid-config.* %files devel -%defattr(-,root,root,-) %{_bindir}/uuid-config %{_includedir}/uuid.h %{_libdir}/libossp-uuid.so @@ -191,27 +189,22 @@ popd %{_mandir}/man1/uuid-config.* %files c++ -%defattr(-,root,root,-) %{_libdir}/libossp-uuid++.so.* %files c++-devel -%defattr(-,root,root,-) %{_includedir}/uuid++.hh %{_libdir}/libossp-uuid++.so %{_mandir}/man3/uuid++.3* %files perl -%defattr(-,root,root,-) %{perl_vendorarch}/auto/* %{perl_vendorarch}/OSSP* %{_mandir}/man3/OSSP::uuid.3* %files dce -%defattr(-,root,root,-) %{_libdir}/libossp-uuid_dce.so.* %files dce-devel -%defattr(-,root,root,-) %{_includedir}/uuid_dce.h %{_libdir}/libossp-uuid_dce.so From 637b24665aaf69ba0e165c7f06b685ac9e5603f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:22:15 +0000 Subject: [PATCH 069/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index d0449a8..5aea14b 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -209,6 +209,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 1.6.2-41 - Perl 5.28 rebuild From a27e928e9ad2da5183441e44cff85c06f583ab19 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:44 +0200 Subject: [PATCH 070/104] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- uuid.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uuid.spec b/uuid.spec index 5aea14b..d204869 100644 --- a/uuid.spec +++ b/uuid.spec @@ -24,6 +24,7 @@ Patch4: uuid-1.6.2-nostrip.patch Patch5: uuid-1.6.2-manfix.patch Patch6: uuid-aarch64.patch +BuildRequires: gcc-c++ BuildRequires: libtool Obsoletes: %{name}-pgsql < 1.6.2-24 From 57aef8a53bb4b8f2bdea66bba30339dbfcb54484 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:16 +0100 Subject: [PATCH 071/104] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- uuid.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/uuid.spec b/uuid.spec index d204869..339c09a 100644 --- a/uuid.spec +++ b/uuid.spec @@ -162,17 +162,9 @@ perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data:: LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts popd -%post -p /sbin/ldconfig - -%post c++ -p /sbin/ldconfig - -%post dce -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%postun c++ -p /sbin/ldconfig - -%postun dce -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets c++ +%ldconfig_scriptlets dce %files %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS From a5d281f790dc20e25b90adc74c1d7547c33842a9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 072/104] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- uuid.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/uuid.spec b/uuid.spec index 339c09a..bd30eb5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -9,7 +9,6 @@ Version: 1.6.2 Release: 42%{?dist} Summary: Universally Unique Identifier library License: MIT -Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz Patch0: uuid-1.6.1-ossp.patch @@ -42,7 +41,6 @@ Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library -Group: Development/Libraries Requires: pkgconfig Requires: %{name} = %{version}-%{release} @@ -51,7 +49,6 @@ Development headers and libraries for OSSP uuid. %package c++ Summary: C++ support for Universally Unique Identifier library -Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description c++ @@ -59,7 +56,6 @@ C++ libraries for OSSP uuid. %package c++-devel Summary: C++ development support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name}-c++ = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -68,7 +64,6 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library -Group: Development/Libraries BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(Data::UUID) @@ -83,7 +78,6 @@ Perl OSSP uuid module. %package dce Summary: DCE support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description dce @@ -91,7 +85,6 @@ DCE OSSP uuid library. %package dce-devel Summary: DCE development support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name}-dce = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} From 1554b91227b7ac4e297f51083221861bbe307a79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:00:35 +0000 Subject: [PATCH 073/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index bd30eb5..84cd4c4 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -195,6 +195,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.6.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 2038dec097fd9f86ab379f0956bb4cccaf91c40c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 31 May 2019 07:19:45 +0200 Subject: [PATCH 074/104] Perl 5.30 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 84cd4c4..b1fd6b5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -195,6 +195,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri May 31 2019 Jitka Plesnikova - 1.6.2-44 +- Perl 5.30 rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.6.2-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7ffbd1f6d370b8820514c1b304131c8ac01f233c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:42:56 +0000 Subject: [PATCH 075/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index b1fd6b5..7b950d1 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -195,6 +195,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.6.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 31 2019 Jitka Plesnikova - 1.6.2-44 - Perl 5.30 rebuild From 14c1784aa1c62e8789582483466ae16bd7de385a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:51:16 +0000 Subject: [PATCH 076/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 7b950d1..7432595 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -195,6 +195,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.2-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.6.2-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e62695d01f37d6d7863bea0c993a1298f08a200d Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 16 Mar 2020 12:33:52 +0100 Subject: [PATCH 077/104] Specify all perl dependencies --- uuid.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 7432595..3104df0 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -66,9 +66,19 @@ C++ development headers and libraries for OSSP uuid. Summary: Perl support for Universally Unique Identifier library BuildRequires: perl-devel BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Carp) +BuildRequires: perl(Config) BuildRequires: perl(Data::UUID) +BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(IO::File) +BuildRequires: perl(MIME::Base64) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) +BuildRequires: perl(Tie::Scalar) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} Requires: perl(Data::UUID) @@ -195,6 +205,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Mar 16 2020 Jitka Plesnikova - 1.6.2-47 +- Specify all perl dependencies + * Fri Jan 31 2020 Fedora Release Engineering - 1.6.2-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2a89eb6d3443a427f94fd8dd61341d153acadb51 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 23 Jun 2020 10:36:02 +0200 Subject: [PATCH 078/104] Perl 5.32 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 3104df0..3da3ba8 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -205,6 +205,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jun 23 2020 Jitka Plesnikova - 1.6.2-48 +- Perl 5.32 rebuild + * Mon Mar 16 2020 Jitka Plesnikova - 1.6.2-47 - Specify all perl dependencies From 03025fd0b2e782ae3c95b469cb43a074166a9c62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:29:17 +0000 Subject: [PATCH 079/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 3da3ba8..674e53f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -205,6 +205,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 23 2020 Jitka Plesnikova - 1.6.2-48 - Perl 5.32 rebuild From f7d4abd5ba8f3ced5fecc0cc77591922573ff211 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:32:37 +0000 Subject: [PATCH 080/104] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- uuid.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uuid.spec b/uuid.spec index 674e53f..94881f5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -23,6 +23,7 @@ Patch4: uuid-1.6.2-nostrip.patch Patch5: uuid-1.6.2-manfix.patch Patch6: uuid-aarch64.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libtool From 1c77a4ac60a0240806536cf187b6e7c3a4c3c688 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:51:04 +0000 Subject: [PATCH 081/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 94881f5..53a43c9 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -206,6 +206,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 461f3f9738bc833e36f05e8fe0f2895b48e96102 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 22:56:30 +0200 Subject: [PATCH 082/104] Perl 5.34 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 53a43c9..a227ca2 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -206,6 +206,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.6.2-51 +- Perl 5.34 rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dac1b76f887843935cec9d2df74b6dca41b03ae3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:14:47 +0000 Subject: [PATCH 083/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index a227ca2..c99d307 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -206,6 +206,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.6.2-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 1.6.2-51 - Perl 5.34 rebuild From 1c40075766f22ee000e7182b785f0aa10e45b066 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:43:48 +0000 Subject: [PATCH 084/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index c99d307..1b1ff78 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -206,6 +206,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.2-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.6.2-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 234561334a98c0f48c1267ca391aa9a2769aa33d Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 24 Jan 2022 21:14:45 +0100 Subject: [PATCH 085/104] make sure LDFLAGS are used during build --- uuid-1.6.2-ldflags.patch | 22 ++++++++++++++++++++++ uuid.spec | 17 +++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 uuid-1.6.2-ldflags.patch diff --git a/uuid-1.6.2-ldflags.patch b/uuid-1.6.2-ldflags.patch new file mode 100644 index 0000000..1d0ae2d --- /dev/null +++ b/uuid-1.6.2-ldflags.patch @@ -0,0 +1,22 @@ +diff -up uuid-1.6.2/Makefile.in.ldflags uuid-1.6.2/Makefile.in +--- uuid-1.6.2/Makefile.in.ldflags 2022-01-24 20:53:01.992171989 +0100 ++++ uuid-1.6.2/Makefile.in 2022-01-24 20:53:02.025171559 +0100 +@@ -112,15 +112,15 @@ all: $(TARGETS) + @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< + + $(LIB_NAME): $(LIB_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(DCE_NAME): $(DCE_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(CXX_NAME): $(CXX_OBJS) +- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) diff --git a/uuid.spec b/uuid.spec index 1b1ff78..d67657f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -20,10 +20,13 @@ Patch3: uuid-1.6.2-hwaddr.patch # do not strip binaries Patch4: uuid-1.6.2-nostrip.patch -Patch5: uuid-1.6.2-manfix.patch -Patch6: uuid-aarch64.patch +Patch5: uuid-1.6.2-manfix.patch +Patch6: uuid-aarch64.patch -BuildRequires: make +# use ldflags for libs too +Patch7: uuid-1.6.2-ldflags.patch + +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libtool @@ -111,6 +114,7 @@ DCE development headers and libraries for OSSP uuid. %patch4 -p1 -b .nostrip %patch5 -p1 -b .manfix %patch6 -p1 -b .aarch64 +%patch7 -p1 -b .ldflags %build # Build the library. @@ -121,6 +125,8 @@ export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}" + %configure \ --disable-static \ --without-perl \ @@ -206,6 +212,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Jan 24 2022 Michal Hlavinka - 1.6.2-54 +- make sure LDFLAGS are used during build + * Sat Jan 22 2022 Fedora Release Engineering - 1.6.2-53 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6f72c1790483a96693b8355c9de67f0913e17afa Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 31 May 2022 08:54:40 +0200 Subject: [PATCH 086/104] Perl 5.36 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index d67657f..88616e1 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -212,6 +212,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Tue May 31 2022 Jitka Plesnikova - 1.6.2-55 +- Perl 5.36 rebuild + * Mon Jan 24 2022 Michal Hlavinka - 1.6.2-54 - make sure LDFLAGS are used during build From f5cc7f0dd949f0501e5a7d70d45bd554f9f523a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:36:51 +0000 Subject: [PATCH 087/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 88616e1..1364ee9 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 55%{?dist} +Release: 56%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -212,6 +212,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.6.2-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue May 31 2022 Jitka Plesnikova - 1.6.2-55 - Perl 5.36 rebuild From 33b19b7ce9efb0abdb683bca3567ec3452e32f78 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:17:37 +0100 Subject: [PATCH 088/104] Remove perl(MODULE_COMPAT), it will be replaced by generators --- uuid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 1364ee9..871494c 100644 --- a/uuid.spec +++ b/uuid.spec @@ -83,7 +83,6 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Tie::Scalar) BuildRequires: perl(warnings) BuildRequires: perl(XSLoader) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} Requires: perl(Data::UUID) From cbac75ca2cca13271fe693a6bef40e3b68709a76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:02:34 +0000 Subject: [PATCH 089/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 871494c..9cfb5a9 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 56%{?dist} +Release: 57%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -211,6 +211,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.6.2-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.6.2-56 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6aa23eb328113a00906fa0f8e9861f0b55856127 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 26 Apr 2023 11:48:05 +0200 Subject: [PATCH 090/104] update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 9cfb5a9..6766950 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -211,6 +211,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Apr 26 2023 Michal Hlavinka - 1.6.2-58 +- update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 + * Sat Jan 21 2023 Fedora Release Engineering - 1.6.2-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 573f99b727e666a6d871c826d4095d4e601a7457 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 26 Apr 2023 11:48:40 +0200 Subject: [PATCH 091/104] reupload source file --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e8a6f34..6b05647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5db0d43a9022a6ebbbc25337ae28942f uuid-1.6.2.tar.gz +SHA512 (uuid-1.6.2.tar.gz) = 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e From 71b1087e7147735a92d34f6e048383d96978edfc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 3 May 2023 12:31:03 +0200 Subject: [PATCH 092/104] use new patch macro format, use pre F37 compatibility option --- uuid.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/uuid.spec b/uuid.spec index 6766950..a146586 100644 --- a/uuid.spec +++ b/uuid.spec @@ -106,14 +106,14 @@ DCE development headers and libraries for OSSP uuid. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .php54 -%patch3 -p1 -b .hwaddr -%patch4 -p1 -b .nostrip -%patch5 -p1 -b .manfix -%patch6 -p1 -b .aarch64 -%patch7 -p1 -b .ldflags +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 -b .php54 +%patch -P3 -p1 -b .hwaddr +%patch -P4 -p1 -b .nostrip +%patch -P5 -p1 -b .manfix +%patch -P6 -p1 -b .aarch64 +%patch -P7 -p1 -b .ldflags %build # Build the library. From e1332378f6f4f4534bf43e15e88505e93e7e2f1e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:35:44 +0200 Subject: [PATCH 093/104] Perl 5.38 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index a146586..52dec3f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -211,6 +211,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 1.6.2-59 +- Perl 5.38 rebuild + * Wed Apr 26 2023 Michal Hlavinka - 1.6.2-58 - update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 From f48d94501568e16616dcc62aebf4bd9dd1e0cd01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:20:50 +0000 Subject: [PATCH 094/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 52dec3f..1854d71 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 59%{?dist} +Release: 60%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -211,6 +211,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.6.2-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 1.6.2-59 - Perl 5.38 rebuild From d6fc5e0cdaad436fc6c55922b8b12096a976c9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 20 Oct 2023 23:16:35 +0100 Subject: [PATCH 095/104] Use standard Fedora linker flags (bug #1548666) https://src.fedoraproject.org/rpms/uuid/pull-request/1 --- uuid.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/uuid.spec b/uuid.spec index 1854d71..233fced 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -122,9 +122,6 @@ export DCE_NAME=libossp-uuid_dce.la export CXX_NAME=libossp-uuid++.la export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}" %configure \ --disable-static \ @@ -134,7 +131,7 @@ export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}" --with-cxx \ --without-pgsql -make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} +make LIBTOOL=/usr/bin/libtool CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" %{?_smp_mflags} # Build the Perl module. pushd perl @@ -211,6 +208,10 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Oct 20 2023 Sérgio Basto - 1.6.2-61 +- Use standard Fedora linker flags (bug #1548666) + https://src.fedoraproject.org/rpms/uuid/pull-request/1 + * Sat Jul 22 2023 Fedora Release Engineering - 1.6.2-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8f37a25b3e57f393c34bba4182210e315c65717d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:23:09 +0000 Subject: [PATCH 096/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 233fced..61fae59 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.6.2-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Oct 20 2023 Sérgio Basto - 1.6.2-61 - Use standard Fedora linker flags (bug #1548666) https://src.fedoraproject.org/rpms/uuid/pull-request/1 From df5e144b85b99d32271ae62c79e7a6025eed4528 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 10 Jun 2024 20:28:43 +0200 Subject: [PATCH 097/104] Perl 5.40 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 61fae59..b4b4d84 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 62%{?dist} +Release: 63%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Jun 10 2024 Jitka Plesnikova - 1.6.2-63 +- Perl 5.40 rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.6.2-62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From aa05b8cceb71977f6fc664f646456cf18f8b20fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:29:34 +0000 Subject: [PATCH 098/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index b4b4d84..170f04f 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 63%{?dist} +Release: 64%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.6.2-64 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 10 2024 Jitka Plesnikova - 1.6.2-63 - Perl 5.40 rebuild From 527b8c1cbf2d4be3c9589f8484c95d6caf116581 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:01:14 +0000 Subject: [PATCH 099/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 170f04f..86e60bb 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 64%{?dist} +Release: 65%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.6.2-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.6.2-64 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2177845923fad89ab4a23729676dcfde5400ce21 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:19:31 +0200 Subject: [PATCH 100/104] Perl 5.42 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 86e60bb..b136d92 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 65%{?dist} +Release: 66%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1.6.2-66 +- Perl 5.42 rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.6.2-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e2f51024b269439f12626635bfb8d5a76b60165d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:55:06 +0000 Subject: [PATCH 101/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index b136d92..2ec6f9c 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 66%{?dist} +Release: 67%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.6.2-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 1.6.2-66 - Perl 5.42 rebuild From c055df887dfefc07807fffca23cf361ead47b64b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:44:18 +0000 Subject: [PATCH 102/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 2ec6f9c..159aa27 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 67%{?dist} +Release: 68%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.6.2-68 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.6.2-67 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 43b3960babe61bb4fd13ddc982c18e467d69b2b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:18:58 +0000 Subject: [PATCH 103/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 159aa27..7995e73 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 68%{?dist} +Release: 69%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.6.2-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.6.2-68 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From fe96fe5d020bb9d9bc3a8076730cdd36544ec8bb Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 22 Jul 2026 18:16:31 +0200 Subject: [PATCH 104/104] Perl 5.44 rebuild --- uuid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uuid.spec b/uuid.spec index 7995e73..ca6dbb5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 69%{?dist} +Release: 70%{?dist} Summary: Universally Unique Identifier library License: MIT URL: http://www.ossp.org/pkg/lib/uuid/ @@ -208,6 +208,9 @@ popd %{_libdir}/libossp-uuid_dce.so %changelog +* Wed Jul 22 2026 Jitka Plesnikova - 1.6.2-70 +- Perl 5.44 rebuild + * Fri Jul 17 2026 Fedora Release Engineering - 1.6.2-69 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild