enforce usage of our c(xx)flags

fix debuginfo
fix generation of MAC address based uuids (#829532 ),
2012-06-19 15:14:57 +02:00 · 2012-06-19 13:25:15 +02:00 · 2012-06-19 12:13:00 +02:00
6 changed files with 116 additions and 2095 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (uuid-1.6.2.tar.gz) = 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
+5db0d43a9022a6ebbbc25337ae28942f  uuid-1.6.2.tar.gz
--- a/uuid-1.6.2-ldflags.patch
+++ b/uuid-1.6.2-ldflags.patch
@ -1,22 +0,0 @@
-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)
--- a/uuid-1.6.2-manfix.patch
+++ b/uuid-1.6.2-manfix.patch
@ -1,13 +0,0 @@
-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
--- a/uuid-1.6.2-php54.patch
+++ b/uuid-1.6.2-php54.patch
@ -1,226 +0,0 @@
-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	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[] = {
-+    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
- };
--- a/uuid-aarch64.patch
+++ b/uuid-aarch64.patch
--- a/uuid.spec
+++ b/uuid.spec
@ -1,37 +1,26 @@
-%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
+%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.2
-Release:        70%{?dist}
+Release:        9%{?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
-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
-Patch5:         uuid-1.6.2-manfix.patch
-Patch6:         uuid-aarch64.patch

-# use ldflags for libs too
-Patch7:	        uuid-1.6.2-ldflags.patch
-
-BuildRequires:  make
-BuildRequires:  gcc-c++
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libtool

-Obsoletes:      %{name}-pgsql < 1.6.2-24
-
 %description
 OSSP uuid is a ISO-C:1999 application programming interface (API)
 and corresponding command line interface (CLI) for the generation
@ -39,12 +28,13 @@ 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 and Perl: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, Perl:5 and
+PHP:4/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
+Group:          Development/Libraries
 Requires:       pkgconfig
 Requires:       %{name} = %{version}-%{release}

@ -53,6 +43,7 @@ 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++
@ -60,6 +51,7 @@ 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,29 +60,44 @@ C++ development headers and libraries for OSSP uuid.

 %package perl
 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)
+Group:          Development/Libraries
 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)

 %description perl
-Perl OSSP uuid module.
+Perl OSSP uuid modules, which includes a Data::UUID replacement.
+
+%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 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
 Requires:       %{name} = %{version}-%{release}

 %description dce
@ -98,6 +105,7 @@ 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}

@ -106,14 +114,10 @@ DCE development headers and libraries for OSSP uuid.

 %prep
 %setup -q
-%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
+%patch0 -p1
+%patch1 -p1
+%patch3 -p1 -b .hwaddr
+%patch4 -p1 -b .nostrip

 %build
 # Build the library.
@ -122,24 +126,34 @@ 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 \
    --without-php \
    --with-dce \
    --with-cxx \
-    --without-pgsql
+    --with-pgsql

-make LIBTOOL=/usr/bin/libtool CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" %{?_smp_mflags}
+make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags}

 # Build the Perl module.
 pushd perl
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=0
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=1
 %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 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

@ -158,21 +172,49 @@ 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/%{name}.ini
+; Enable %{name} extension module
+extension=%{name}.so
+__EOF__
+
+
+
 %check
 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

-%ldconfig_scriptlets
-%ldconfig_scriptlets c++
-%ldconfig_scriptlets dce
+pushd php
+LD_LIBRARY_PATH=../.libs make test
+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

 %files
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
 %{_libdir}/libossp-uuid.so.*
@ -180,6 +222,7 @@ popd
 %exclude %{_mandir}/man1/uuid-config.*

 %files devel
+%defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
 %{_libdir}/libossp-uuid.so
@ -188,226 +231,53 @@ 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}/Data*
 %{perl_vendorarch}/OSSP*
+%{_mandir}/man3/Data::UUID.3*
 %{_mandir}/man3/OSSP::uuid.3*

+%files php
+%defattr(-,root,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.*

 %files dce-devel
+%defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
 %{_libdir}/libossp-uuid_dce.so

 %changelog
-* Wed Jul 22 2026 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-70
- Perl 5.44 rebuild
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-68
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-67
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-66
- Perl 5.42 rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-65
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-64
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 10 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-63
- Perl 5.40 rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-62
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Oct 20 2023 Sérgio Basto <sergio@serjux.com> - 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 <releng@fedoraproject.org> - 1.6.2-60
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-59
- Perl 5.38 rebuild
-
-* Wed Apr 26 2023 Michal Hlavinka <mhlavink@redhat.com> - 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 <releng@fedoraproject.org> - 1.6.2-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-56
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-55
- Perl 5.36 rebuild
-
-* Mon Jan 24 2022 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-54
- make sure LDFLAGS are used during build
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-53
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-51
- Perl 5.34 rebuild
-
-* 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
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.6.2-37
- Rebuild due to bug in RPM (RHBZ #1468476)
-
-* Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-36
- Perl 5.26 rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Sep 1 2016 Matias Kreder <mkreder@gmail.com> - 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 <jplesnik@redhat.com> - 1.6.2-33
- Perl 5.24 rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jun 05 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-30
- Perl 5.22 rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.6.2-29
- Rebuilt for GCC 5 C++11 ABI change
-
-* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-28
- Perl 5.20 rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jun 19 2014 Remi Collet <rcollet@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.6.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Oct 30 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-24
- drop uuid-pgsql subpackage, it is outdated and does not work, use 
-  uuid-ossp module from postgresql-contrib instead
-
-* Mon Sep 16 2013 Paul Howarth <paul@city-fan.org> - 1.6.2-23
- drop the perl(Data::UUID) compatibility shim and require the real thing
-  instead (#998591)
-
-* Thu Sep 12 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-22
- rebuild for postgresql api change
-
-* Wed Aug 14 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-21
- fix aarch64 support (#926687)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.6.2-19
- Perl 5.18 rebuild
-
-* Thu May 30 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-18
- describe -r in man page
-
-* Fri Mar 22 2013 Remi Collet <rcollet@redhat.com> - 1.6.2-17
- rebuild for http://fedoraproject.org/wiki/Features/Php55
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 06 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-15
- make uuid-php compatible with php 5.4 (#873594)
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 1.6.2-13
- Perl 5.16 rebuild
-
-* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-12
+* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-9
 - enforce usage of our c(xx)flags

-* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-11
+* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-8
 - fix debuginfo

-* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-10
+* Tue Jun 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-7
 - fix generation of MAC address based uuids (#829532), 
  patch by Philip Prindeville

-* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 1.6.2-9
- Perl 5.16 rebuild
-
-* Thu Jan 19 2012 Remi Collet <remi@fedoraproject.org> - 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 <rel-eng@lists.fedoraproject.org> - 1.6.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.6.2-6
 - Perl mass rebuild
Author	SHA1	Message	Date
Michal Hlavinka	58fe4af631	enforce usage of our c(xx)flags	2012-06-19 15:14:57 +02:00
Michal Hlavinka	57ab21bc3e	fix debuginfo	2012-06-19 13:25:15 +02:00
Michal Hlavinka	5a2c4255c1	fix generation of MAC address based uuids (#829532 ), patch by Philip Prindeville	2012-06-19 12:13:00 +02:00