Fix gpgme main and -devel shared object conflicts (#50)

* Fix gpgme main and -devel shared object conflicts

* Bump version of gpgme.spec
This commit is contained in:
Mateusz Malisz 2020-08-20 06:50:38 -07:00 коммит произвёл GitHub
Родитель 2e9f5764fd
Коммит b1fdfb72a1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 14 добавлений и 11 удалений

Просмотреть файл

@ -3,7 +3,7 @@
Summary: High-Level Crypto API
Name: gpgme
Version: 1.13.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+ or LGPLv2+
URL: https://www.gnupg.org/(it)/related_software/gpgme/index.html
Group: System Environment/Security
@ -84,6 +84,7 @@ make check
%{_datadir}/common-lisp/source/gpgme/*
%{_includedir}/*.h
%{_libdir}/*.so*
%exclude %{_libdir}/*.so.*
%{_libdir}/pkgconfig/%{name}*.pc
%files -n python3-gpg
@ -98,10 +99,12 @@ make check
%{python_sitearch}/gpg/
%changelog
* Thu Aug 20 2020 Mateusz Malisz <mamalisz@microsoft.com> 1.13.1-5
- Resolve file conflicts for shared objects.
* Wed May 13 2020 Emre Girgin <mrgirgin@microsoft.com> 1.13.1-4
- Add python-gpg subpackage.
* Sat May 09 00:21:33 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.13.1-3
- Added %%license line automatically
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.13.1-3
- Added %%license line automatically
* Tue Apr 21 2020 Nicolas Ontiveros <niontive@microsoft.com> 1.13.1-2
- Use gnupg2 for Requires and BR.
* Fri Apr 17 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 1.13.1-1

Просмотреть файл

@ -154,7 +154,7 @@ libksba-1.3.5-3.cm1.aarch64.rpm
npth-1.6-3.cm1.aarch64.rpm
pinentry-1.1.0-3.cm1.aarch64.rpm
gnupg2-2.2.20-3.cm1.aarch64.rpm
gpgme-1.13.1-4.cm1.aarch64.rpm
gpgme-1.13.1-5.cm1.aarch64.rpm
mariner-repos-1.0-9.cm1.noarch.rpm
libffi-3.2.1-10.cm1.aarch64.rpm
libtasn1-4.14-2.cm1.aarch64.rpm

Просмотреть файл

@ -154,7 +154,7 @@ libksba-1.3.5-3.cm1.x86_64.rpm
npth-1.6-3.cm1.x86_64.rpm
pinentry-1.1.0-3.cm1.x86_64.rpm
gnupg2-2.2.20-3.cm1.x86_64.rpm
gpgme-1.13.1-4.cm1.x86_64.rpm
gpgme-1.13.1-5.cm1.x86_64.rpm
mariner-repos-1.0-9.cm1.noarch.rpm
libffi-3.2.1-10.cm1.x86_64.rpm
libtasn1-4.14-2.cm1.x86_64.rpm

Просмотреть файл

@ -122,9 +122,9 @@ gnupg2-2.2.20-3.cm1.aarch64.rpm
gnupg2-debuginfo-2.2.20-3.cm1.aarch64.rpm
gperf-3.1-3.cm1.aarch64.rpm
gperf-debuginfo-3.1-3.cm1.aarch64.rpm
gpgme-1.13.1-4.cm1.aarch64.rpm
gpgme-debuginfo-1.13.1-4.cm1.aarch64.rpm
gpgme-devel-1.13.1-4.cm1.aarch64.rpm
gpgme-1.13.1-5.cm1.aarch64.rpm
gpgme-debuginfo-1.13.1-5.cm1.aarch64.rpm
gpgme-devel-1.13.1-5.cm1.aarch64.rpm
grep-3.1-3.cm1.aarch64.rpm
grep-debuginfo-3.1-3.cm1.aarch64.rpm
grep-lang-3.1-3.cm1.aarch64.rpm

Просмотреть файл

@ -122,9 +122,9 @@ gnupg2-2.2.20-3.cm1.x86_64.rpm
gnupg2-debuginfo-2.2.20-3.cm1.x86_64.rpm
gperf-3.1-3.cm1.x86_64.rpm
gperf-debuginfo-3.1-3.cm1.x86_64.rpm
gpgme-1.13.1-4.cm1.x86_64.rpm
gpgme-debuginfo-1.13.1-4.cm1.x86_64.rpm
gpgme-devel-1.13.1-4.cm1.x86_64.rpm
gpgme-1.13.1-5.cm1.x86_64.rpm
gpgme-debuginfo-1.13.1-5.cm1.x86_64.rpm
gpgme-devel-1.13.1-5.cm1.x86_64.rpm
grep-3.1-3.cm1.x86_64.rpm
grep-debuginfo-3.1-3.cm1.x86_64.rpm
grep-lang-3.1-3.cm1.x86_64.rpm