Fix duplicate file issues in harfbuzz, cyrus-sasl and rrdtool (#9985)
The circular dependency check failure is unrelated to this change
This commit is contained in:
Andrew Phelps
GitHub
Родитель
a928ed0b6b
Коммит
0dadd7bc5a
|
|
@ -5,7 +5,7 @@
|
|||
Summary: Cyrus Simple Authentication Service Layer (SASL) library
|
||||
Name: %{_base_name}-bootstrap
|
||||
Version: 2.1.28
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: BSD with advertising
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -145,7 +145,9 @@ make %{?_smp_mflags} check
|
|||
%{_sysconfdir}/sysconfig/saslauthd
|
||||
/lib/systemd/system/saslauthd.service
|
||||
%{_libdir}/systemd/system-preset/50-saslauthd.preset
|
||||
%{_sbindir}/*
|
||||
%{_sbindir}/pluginviewer
|
||||
%{_sbindir}/saslauthd
|
||||
%{_sbindir}/testsaslauthd
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%files devel
|
||||
|
|
@ -192,6 +194,9 @@ make %{?_smp_mflags} check
|
|||
%exclude %{_plugindir2}/libsql.so.%{_soversion}*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2024 Andrew Phelps <anphel@microsoft.com> - 2.1.28-8
|
||||
- Update file listings to remove duplicate files
|
||||
|
||||
* Thu May 16 2024 Daniel McIlvaney <damcilva@microsoft.com> - 2.1.28-7
|
||||
- Sanitize license files
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
Summary: Cyrus Simple Authentication Service Layer (SASL) library
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.28
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: BSD with advertising
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -251,7 +251,9 @@ make %{?_smp_mflags} check
|
|||
%{_sysconfdir}/sysconfig/saslauthd
|
||||
/lib/systemd/system/saslauthd.service
|
||||
%{_libdir}/systemd/system-preset/50-saslauthd.preset
|
||||
%{_sbindir}/*
|
||||
%{_sbindir}/pluginviewer
|
||||
%{_sbindir}/saslauthd
|
||||
%{_sbindir}/testsaslauthd
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%files devel
|
||||
|
|
@ -309,6 +311,9 @@ make %{?_smp_mflags} check
|
|||
%{_plugindir2}/libsql.so.%{_soversion}*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2024 Andrew Phelps <anphel@microsoft.com> - 2.1.28-8
|
||||
- Update file listings to remove duplicate files
|
||||
|
||||
* Thu May 16 2024 Daniel McIlvaney <damcilva@microsoft.com> - 2.1.28-7
|
||||
- Sanitize license files
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: opentype text shaping engine
|
||||
Name: harfbuzz
|
||||
Version: 8.3.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -16,7 +16,6 @@ BuildRequires: gcc-c++
|
|||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: make
|
||||
%global with_check 1
|
||||
%if 0%{?with_check}
|
||||
BuildRequires: python3-devel
|
||||
%endif
|
||||
|
|
@ -58,24 +57,42 @@ find . -type f -name "*.py" -exec sed -i'' -e '1 s|^#!\s*/usr/bin/env\s\+python3
|
|||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%doc NEWS AUTHORS README
|
||||
%{_libdir}/*.so*
|
||||
%{_libdir}/libharfbuzz.so.0*
|
||||
%{_libdir}/libharfbuzz-cairo.so.*
|
||||
%{_libdir}/libharfbuzz-gobject.so.0*
|
||||
%{_libdir}/libharfbuzz-subset.so.0*
|
||||
%dir %{_libdir}/girepository-1.0
|
||||
%{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib
|
||||
%{_bindir}/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc %{_datadir}/gtk-doc
|
||||
%{_bindir}/hb-info
|
||||
%{_bindir}/hb-view
|
||||
%{_bindir}/hb-ot-shape-closure
|
||||
%{_bindir}/hb-shape
|
||||
%{_bindir}/hb-subset
|
||||
%dir %{_includedir}/%{name}
|
||||
%{_includedir}/%{name}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/cmake/harfbuzz/harfbuzz-config.cmake
|
||||
%{_libdir}/libharfbuzz.so
|
||||
%{_libdir}/libharfbuzz-gobject.so
|
||||
%{_libdir}/libharfbuzz-cairo.so
|
||||
%{_libdir}/libharfbuzz-icu.so
|
||||
%{_libdir}/libharfbuzz-subset.so
|
||||
%{_libdir}/pkgconfig/harfbuzz.pc
|
||||
%{_libdir}/pkgconfig/harfbuzz-cairo.pc
|
||||
%{_libdir}/pkgconfig/harfbuzz-gobject.pc
|
||||
%{_libdir}/pkgconfig/harfbuzz-icu.pc
|
||||
%{_libdir}/pkgconfig/harfbuzz-subset.pc
|
||||
%{_libdir}/cmake/harfbuzz/
|
||||
%dir %{_datadir}/gir-1.0
|
||||
%{_datadir}/gir-1.0/HarfBuzz-0.0.gir
|
||||
%{_libdir}/libharfbuzz-icu.so.*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2024 Andrew Phelps <anphel@microsoft.com> - 8.3.0-2
|
||||
- Update file listings to remove duplicate files
|
||||
|
||||
* Mon Jan 29 2024 Bala <balakumaran.kannan@microsoft.com> - 8.3.0-1
|
||||
- Update source to 8.3.0
|
||||
- Removed CVE-2023-25193 patch as it was merged to latest version
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
Summary: Round Robin Database Tool to store and display time-series data
|
||||
Name: rrdtool
|
||||
Version: 1.8.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2 OR GPLv2 WITH FLOSS License Exception
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -130,15 +130,15 @@ rm -rf %{buildroot}%{_libdir}/python2.7
|
|||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%{_bindir}/*
|
||||
%{_libdir}/*.so*
|
||||
%{_libdir}/*.so.*
|
||||
%{_unitdir}/rrdcached.service
|
||||
%{_unitdir}/rrdcached.socket
|
||||
%exclude %{_datadir}/locale/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files -n python3-rrdtool
|
||||
|
|
@ -161,6 +161,9 @@ rm -rf %{buildroot}%{_libdir}/python2.7
|
|||
%{_libdir}/ruby
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2024 Andrew Phelps <anphel@microsoft.com> - 1.8.0-2
|
||||
- Update file listings to remove duplicate files
|
||||
|
||||
* Mon Nov 06 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.8.0-1
|
||||
- Auto-upgrade to 1.8.0 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче