SPECS/uuid.spec

@@ -6,7 +6,7 @@
 
 Name:           uuid
 Version:        1.6.2
-Release:        65%{?dist}
+Release:        55%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 URL:            http://www.ossp.org/pkg/lib/uuid/
@@ -24,7 +24,7 @@ Patch5:         uuid-1.6.2-manfix.patch
 Patch6:         uuid-aarch64.patch
 
 # use ldflags for libs too
-Patch7:	        uuid-1.6.2-ldflags.patch
+Patch7:         uuid-1.6.2-ldflags.patch
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
@@ -83,6 +83,7 @@ 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)
 
@@ -106,14 +107,14 @@ 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
+%patch2 -p1 -b .php54
+%patch3 -p1 -b .hwaddr
+%patch4 -p1 -b .nostrip
+%patch5 -p1 -b .manfix
+%patch6 -p1 -b .aarch64
+%patch7 -p1 -b .ldflags
 
 %build
 # Build the library.
@@ -122,7 +123,9 @@ 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 \
     --without-perl \
@@ -131,7 +134,7 @@ export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so
     --with-cxx \
     --without-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
@@ -158,6 +161,13 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 popd
 
+# fix multilib issues
+cp $RPM_BUILD_ROOT/%{_bindir}/uuid-config $RPM_BUILD_ROOT/%{_bindir}/uuid-config.$(uname -m)
+cat >$RPM_BUILD_ROOT/%{_bindir}/uuid-config <<EOF
+#!/bin/sh
+exec \$0.\$(uname -m) "\$@"
+EOF
+
 %check
 make check
 
@@ -180,7 +190,7 @@ popd
 %exclude %{_mandir}/man1/uuid-config.*
 
 %files devel
-%{_bindir}/uuid-config
+%{_bindir}/uuid-config*
 %{_includedir}/uuid.h
 %{_libdir}/libossp-uuid.so
 %{_libdir}/pkgconfig/ossp-uuid.pc
@@ -208,55 +218,18 @@ popd
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.2-65
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.6.2-64
-- Rebuilt for MSVSphere 10
-
-* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 1.6.2-64
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.6.2-63
-- Bump release for June 2024 mass 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
+* Thu Feb 24 2022 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-55
+- fix build flags (#2044896)
 
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-53
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* 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
 
-* 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 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 May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-51
-- Perl 5.34 rebuild
+* 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