Compare commits
No commits in common. "c8" and "de60a8ebaea91f22b2e68accad8be7d8be5f8848" have entirely different histories.
c8
...
de60a8ebae
|
|
@ -1 +1 @@
|
|||
SOURCES/uuid-1.6.2.tar.gz
|
||||
uuid-1.6.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3e22126f0842073f4ea6a50b1f59dcb9d094719f SOURCES/uuid-1.6.2.tar.gz
|
||||
3e22126f0842073f4ea6a50b1f59dcb9d094719f uuid-1.6.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
diff -up uuid-1.6.2/uuid_str.c.vaendfix uuid-1.6.2/uuid_str.c
|
||||
--- uuid-1.6.2/uuid_str.c.vaendfix 2008-03-07 11:49:59.000000000 +0100
|
||||
+++ uuid-1.6.2/uuid_str.c 2018-10-14 12:56:20.500131215 +0200
|
||||
@@ -698,6 +698,7 @@ str_vasprintf(
|
||||
|
||||
va_copy(ap_tmp, ap);
|
||||
n = str_vsnprintf(NULL, 0, fmt, ap_tmp);
|
||||
+ va_end(ap_tmp);
|
||||
if ((rv = (char *)malloc(n+1)) == NULL)
|
||||
return NULL;
|
||||
str_vsnprintf(rv, n+1, fmt, ap);
|
||||
@@ -738,6 +739,7 @@ str_vrsprintf(
|
||||
va_copy(ap_tmp, ap);
|
||||
n = strlen(*str);
|
||||
rv = str_vsnprintf(NULL, 0, fmt, ap_tmp);
|
||||
+ va_end(ap_tmp);
|
||||
if ((*str = (char *)realloc(*str, n+rv+1)) == NULL)
|
||||
return -1;
|
||||
str_vsnprintf((*str)+n, rv+1, fmt, ap);
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
|
|
@ -0,0 +1,207 @@
|
|||
diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
|
||||
--- uuid-1.5.1.orig/Makefile.PL 2006-01-15 12:37:43.000000000 -0600
|
||||
+++ uuid-1.5.1/Makefile.PL 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -44,7 +44,7 @@
|
||||
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 -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
|
||||
--- uuid-1.5.1.orig/Makefile.in 2006-07-31 07:20:03.000000000 -0500
|
||||
+++ uuid-1.5.1/Makefile.in 2006-09-21 16:06:31.000000000 -0500
|
||||
@@ -61,13 +61,13 @@
|
||||
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_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
|
||||
@@ -78,10 +78,10 @@
|
||||
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@
|
||||
@@ -230,7 +230,7 @@
|
||||
$(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)/"; \
|
||||
@@ -240,7 +240,7 @@
|
||||
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/; \
|
||||
@@ -275,7 +275,7 @@
|
||||
-@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; \
|
||||
@@ -289,7 +289,7 @@
|
||||
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 -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
|
||||
--- uuid-1.5.1.orig/perl/Makefile.PL 2006-01-13 00:44:33.000000000 -0600
|
||||
+++ uuid-1.5.1/perl/Makefile.PL 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -33,9 +33,9 @@
|
||||
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 @@
|
||||
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 -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
|
||||
--- uuid-1.5.1.orig/pgsql/Makefile 2006-07-31 07:36:58.000000000 -0500
|
||||
+++ uuid-1.5.1/pgsql/Makefile 2006-09-21 16:07:23.000000000 -0500
|
||||
@@ -17,13 +17,13 @@
|
||||
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")
|
||||
rpath :=
|
||||
|
||||
@@ -33,16 +33,16 @@
|
||||
include $(top_builddir)/src/Makefile.shlib
|
||||
|
||||
uuid.sql: uuid.sql.in
|
||||
- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
|
||||
+ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' <uuid.sql.in >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 -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
|
||||
--- uuid-1.5.1.orig/php/Makefile.local 2006-07-31 06:41:46.000000000 -0500
|
||||
+++ uuid-1.5.1/php/Makefile.local 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -48,7 +48,7 @@
|
||||
@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 -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
|
||||
--- uuid-1.5.1.orig/php/config.m4 2006-01-13 00:44:34.000000000 -0600
|
||||
+++ uuid-1.5.1/php/config.m4 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -34,7 +34,7 @@
|
||||
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)
|
||||
dnl avoid conflict with libc's uuid_create(3)
|
||||
diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
|
||||
--- uuid-1.5.1.orig/php/uuid.ts 2006-01-13 00:44:34.000000000 -0600
|
||||
+++ uuid-1.5.1/php/uuid.ts 2006-09-21 15:59:40.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 -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
|
||||
--- uuid-1.5.1.orig/uuid-config.in 2006-01-13 00:44:30.000000000 -0600
|
||||
+++ uuid-1.5.1/uuid-config.in 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -120,7 +120,7 @@
|
||||
output_extra="$output_extra $uuid_ldflags"
|
||||
;;
|
||||
--libs)
|
||||
- output="$output -luuid"
|
||||
+ output="$output -lossp-uuid"
|
||||
output_extra="$output_extra $uuid_libs"
|
||||
;;
|
||||
* )
|
||||
diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
|
||||
--- uuid-1.5.1.orig/uuid.pc.in 2006-01-13 00:44:30.000000000 -0600
|
||||
+++ uuid-1.5.1/uuid.pc.in 2006-09-21 15:59:40.000000000 -0500
|
||||
@@ -37,6 +37,6 @@
|
||||
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@
|
||||
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
#!/bin/sh
|
||||
|
||||
|
||||
function ntimes
|
||||
{
|
||||
I=0
|
||||
for((I=0;I<50;I++))
|
||||
do
|
||||
"$@"
|
||||
done
|
||||
}
|
||||
|
||||
function fail
|
||||
{
|
||||
echo "FAIL: $1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# check output is always different
|
||||
if [ -n "$(uuid -n 50 | uniq --repeated)" ]
|
||||
then
|
||||
fail "dulicated output"
|
||||
fi
|
||||
|
||||
# check it can parse uuid it generated
|
||||
if ! uuid -d $(uuid -v1) >/dev/null 2>&1
|
||||
then
|
||||
fail "can't decore uuid"
|
||||
fi
|
||||
|
||||
# check v3 uses same output for same seed
|
||||
if ! [ "$({ uuid -n 5 -v3 ns:URL https://fedoraproject.org/; uuid -n 5 -v3 ns:URL https://fedoraproject.org/ ; } | wc -l)" = 10 ]
|
||||
then
|
||||
fail "v3 should have same output for same seed"
|
||||
fi
|
||||
|
||||
# check v5 uses same output for same seed
|
||||
if ! [ "$({ uuid -n 5 -v3 ns:URL https://fedoraproject.org/; uuid -n 5 -v3 ns:URL https://fedoraproject.org/ ; } | wc -l)" = 10 ]
|
||||
then
|
||||
fail "v5 should have same output for same seed"
|
||||
fi
|
||||
|
||||
# check v3 and v5 use different hashes (output)
|
||||
if ! [ "$({ uuid -n 5 -v3 ns:URL https://fedoraproject.org/; uuid -n 5 -v5 ns:URL https://fedoraproject.org/ ; } | uniq | wc -l)" = 2 ]
|
||||
then
|
||||
fail "v3 and v5 uuid shouldn't be the same"
|
||||
fi
|
||||
|
||||
echo "SUCCESS"
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- simple:
|
||||
dir: .
|
||||
run: run_tests.sh
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -up uuid-1.6.2/Makefile.in.ldflagsfix uuid-1.6.2/Makefile.in
|
||||
--- uuid-1.6.2/Makefile.in.ldflagsfix 2018-10-02 14:55:42.239927382 +0200
|
||||
+++ uuid-1.6.2/Makefile.in 2018-10-02 14:55:42.267927246 +0200
|
||||
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 $<
|
||||
|
||||
|
|
@ -6,10 +6,9 @@
|
|||
|
||||
Name: uuid
|
||||
Version: 1.6.2
|
||||
Release: 43%{?dist}
|
||||
Release: 55%{?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
|
||||
|
|
@ -21,12 +20,14 @@ 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
|
||||
Patch7: uuid-1.6.2-ldflagsfix.patch
|
||||
Patch8: uuid-1.6.2-vaendfix.patch
|
||||
Patch5: uuid-1.6.2-manfix.patch
|
||||
Patch6: uuid-aarch64.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# use ldflags for libs too
|
||||
Patch7: uuid-1.6.2-ldflags.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
|
||||
Obsoletes: %{name}-pgsql < 1.6.2-24
|
||||
|
|
@ -44,7 +45,6 @@ Data::UUID APIs.
|
|||
|
||||
%package devel
|
||||
Summary: Development support for Universally Unique Identifier library
|
||||
Group: Development/Libraries
|
||||
Requires: pkgconfig
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
|
|
@ -53,7 +53,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++
|
||||
|
|
@ -61,7 +60,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}
|
||||
|
||||
|
|
@ -70,12 +68,21 @@ 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-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)
|
||||
|
|
@ -85,7 +92,6 @@ Perl OSSP uuid module.
|
|||
|
||||
%package dce
|
||||
Summary: DCE support for Universally Unique Identifier library
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description dce
|
||||
|
|
@ -93,7 +99,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}
|
||||
|
||||
|
|
@ -109,8 +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 .ldflagsfix
|
||||
%patch8 -p1 -b .vaendfix
|
||||
%patch7 -p1 -b .ldflags
|
||||
|
||||
%build
|
||||
# Build the library.
|
||||
|
|
@ -121,6 +125,7 @@ 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 \
|
||||
|
|
@ -173,23 +178,11 @@ 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
|
||||
|
||||
%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
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
|
||||
%{_bindir}/uuid
|
||||
%{_libdir}/libossp-uuid.so.*
|
||||
|
|
@ -197,7 +190,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%exclude %{_mandir}/man1/uuid-config.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/uuid-config*
|
||||
%{_includedir}/uuid.h
|
||||
%{_libdir}/libossp-uuid.so
|
||||
|
|
@ -206,39 +198,68 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_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
|
||||
|
||||
%changelog
|
||||
* Fri Oct 30 2020 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-43
|
||||
- fix multilib compatibility (#1853169)
|
||||
* Thu Feb 24 2022 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-55
|
||||
- fix build flags (#2044896)
|
||||
|
||||
* Mon Oct 15 2018 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-42
|
||||
- fix coverity scan found issues (#1602724)
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-53
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Oct 02 2018 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-41
|
||||
- make sure ldflags are used (#1630635)
|
||||
* Fri Aug 6 2021 Florian Weimer <fweimer@redhat.com> - 1.6.2-52
|
||||
- Rebuild to pick up new build flags from redhat-rpm-config (#1984652)
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-51
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-50
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-49
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-48
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Mon Mar 16 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-47
|
||||
- Specify all perl dependencies
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-45
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-44
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-41
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
Loading…
Reference in New Issue