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 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 adaf6ec..ca6dbb5 100644 --- a/uuid.spec +++ b/uuid.spec @@ -6,10 +6,9 @@ Name: uuid Version: 1.6.2 -Release: 40%{?dist} +Release: 70%{?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,9 +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 +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++ BuildRequires: libtool Obsoletes: %{name}-pgsql < 1.6.2-24 @@ -41,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} @@ -50,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++ @@ -58,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} @@ -67,13 +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) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Tie::Scalar) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) Requires: %{name} = %{version}-%{release} Requires: perl(Data::UUID) @@ -82,7 +91,6 @@ Perl OSSP uuid module. %package dce Summary: DCE support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description dce @@ -90,7 +98,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} @@ -99,13 +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 +%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. @@ -114,8 +122,7 @@ 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 \ @@ -124,7 +131,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" --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 @@ -161,20 +168,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 -%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.* @@ -182,7 +180,6 @@ popd %exclude %{_mandir}/man1/uuid-config.* %files devel -%defattr(-,root,root,-) %{_bindir}/uuid-config %{_includedir}/uuid.h %{_libdir}/libossp-uuid.so @@ -191,31 +188,117 @@ 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 %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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild