Automatic update of the `icu` package. (#856)

* Automatic package update.

* Updating packages requiring re-compilation after 'icu' library version update.

* Making shared library versions explicit inside the '%files' section.

Co-authored-by: Pawel Winogrodzki <pawel.winogrodzki@microsoft.com>
This commit is contained in:
CBL-Mariner-Bot 2021-04-16 18:31:13 -07:00 committed by GitHub
parent 9432e35aed
commit c474a501a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 32 deletions

View File

@ -1,5 +1,5 @@
{
"Signatures": {
"icu-68.2.0.1.tar.gz": "65a36c3a60c335ff846479035b0a5ef022fcda4778854f531fbbb9da008a656b"
"icu-68.2.0.6.tar.gz": "d69265080220977fd7fd53869dddd6a1381352005541727d2063ef1261092707"
}
}

View File

@ -1,6 +1,6 @@
Summary: International Components for Unicode.
Name: icu
Version: 68.2.0.1
Version: 68.2.0.6
Release: 1%{?dist}
License: BSD and MIT and Public Domain and naist-2003
URL: https://github.com/microsoft/icu
@ -48,7 +48,8 @@ make -C icu/icu4c/source DESTDIR=%{buildroot} install
%license LICENSE
%{_bindir}/*
%{_sbindir}/*
%{_libdir}/*.so.*
%{_libdir}/*.so.68
%{_libdir}/*.so.68.*
%exclude %{_libdir}/debug/
%exclude %{_libdir}/icu/
@ -60,6 +61,10 @@ make -C icu/icu4c/source DESTDIR=%{buildroot} install
%{_libdir}/pkgconfig/*.pc
%changelog
* Fri Apr 16 2021 CBL-Mariner Service Account <cblmargh@microsoft.com> - 68.2.0.6-1
- Update to version "68.2.0.6".
- Explicitly listing provided shared libraries' versions.
* Sun Apr 04 2021 CBL-Mariner Service Account <cblmargh@microsoft.com> - 68.2.0.1-1
- Update to version "68.2.0.1".

View File

@ -1,18 +1,18 @@
Summary: libpsl - C library to handle the Public Suffix List
Name: libpsl
Version: 0.20.2
Release: 4%{?dist}
License: MIT
URL: https://github.com/rockdaboot/libpsl
Group: System Environment/Development
Summary: libpsl - C library to handle the Public Suffix List
Name: libpsl
Version: 0.20.2
Release: 5%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
%define sha1 libpsl=890376d6038652911cfa853ccfb5b993ae0743ee
Group: System Environment/Development
URL: https://github.com/rockdaboot/libpsl
Source0: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
BuildRequires: icu-devel
BuildRequires: python2
Requires: icu
BuildRequires: icu-devel
BuildRequires: python2
Requires: icu
%description
libpsl is a C library to handle the Public Suffix List. A "public suffix" is a
@ -75,7 +75,7 @@ make check
%files
%defattr(-,root,root)
%license LICENSE
%license COPYING LICENSE
%{_libdir}/*.so.*
%files -n psl
@ -94,12 +94,20 @@ make check
%{_libdir}/pkgconfig/*
%changelog
* Sat May 09 00:21:12 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.20.2-4
* Fri Apr 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20.2-5
- Bumping up release to re-compile against the new version of the 'icu' libraries.
- License verified.
- Removing the 'sha1' macro.
- Updated the '%%license' macro.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 0.20.2-4
- Added %%license line automatically
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.20.2-3
- Initial CBL-Mariner import from Photon (license: Apache2).
* Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 0.20.2-2
- Added BuildRequires python2
* Mon Sep 17 2018 Bo Gan <ganb@vmware.com> 0.20.2-1
- Initial packaging of libpsl
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.20.2-3
- Initial CBL-Mariner import from Photon (license: Apache2).
* Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 0.20.2-2
- Added BuildRequires python2
* Mon Sep 17 2018 Bo Gan <ganb@vmware.com> 0.20.2-1
- Initial packaging of libpsl

View File

@ -42,9 +42,14 @@
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.12.5
Release: 4%{?dist}
Release: 5%{?dist}
# See LICENSE.GPL3-EXCEPT.txt, for exception details
License: GFDL AND LGPLv3 AND GPLv2 AND GPLv3 with exceptions AND QT License Agreement 4.0
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://qt-project.org/
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
BuildRequires: build-essential
BuildRequires: systemd
@ -64,15 +69,10 @@ BuildRequires: libjpeg-turbo-devel
BuildRequires: zlib-devel
BuildRequires: qt5-rpm-macros
Requires: icu
Requires(post): chkconfig
Requires(postun): chkconfig
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
Source1: qtlogging.ini
@ -529,6 +529,7 @@ fi
%license LICENSE.FDL
%license LICENSE.GPL*
%license LICENSE.LGPL*
%license LICENSE.QT-LICENSE-AGREEMENT-4.0
%if 0%{?qtchooser}
%dir %{_sysconfdir}/xdg/qtchooser
# not editable config files, so not using %%config here
@ -761,6 +762,14 @@ fi
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
%changelog
* Fri Apr 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.12.5-5
- Added explicit 'Requires' on 'icu'.
- Bumping up release to re-compile against the new version of the 'icu' libraries.
- License verified.
- Updated the 'License' tag.
- Updated the 'URL' tag.
- Updated the '%%license' macro.
* Thu Jul 30 2020 Joe Schmitt <joschmit@microsoft.com> - 5.12.5-4
- Add missing Requires for chkconfig.

View File

@ -1775,8 +1775,8 @@
"type": "other",
"other": {
"name": "icu",
"version": "68.2.0.1",
"downloadUrl": "https://github.com/microsoft/icu/archive/v68.2.0.1.tar.gz"
"version": "68.2.0.6",
"downloadUrl": "https://github.com/microsoft/icu/archive/v68.2.0.6.tar.gz"
}
}
},