Replace openeuler with vendor

This commit is contained in:
starlet-dx 2022-11-18 17:13:45 +08:00
parent 0ba3bb82b5
commit 7ec7565a5d

View File

@ -1,6 +1,11 @@
%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
%if "%{vendor}" == "openEuler"
%define vendor openeuler
%endif
Name: certmonger Name: certmonger
Version: 0.79.11 Version: 0.79.11
Release: 4 Release: 5
Summary: Certificate status monitor and PKI enrollment client Summary: Certificate status monitor and PKI enrollment client
License: GPLv3+ License: GPLv3+
URL: http://pagure.io/certmonger/ URL: http://pagure.io/certmonger/
@ -58,12 +63,12 @@ if test $1 -eq 1 ; then
fi fi
%triggerin -- certmonger < 0.58 %triggerin -- certmonger < 0.58
if test $1 -gt 1 ; then if test $1 -gt 1 ; then
objpath=`dbus-send --system --reply-timeout=10000 --dest=org.openeulerhosted.certmonger \ objpath=`dbus-send --system --reply-timeout=10000 --dest=org.%{vendor}hosted.certmonger \
--print-reply=o /org/openeulerhosted/certmonger org.openeulerhosted.certmonger.find_ca_by_nickname \ --print-reply=o /org/%{vendor}hosted/certmonger org.%{vendor}hosted.certmonger.find_ca_by_nickname \
string:dogtag-ipa-renew-agent 2> /dev/null | sed -r 's,^ +,,g' || true` string:dogtag-ipa-renew-agent 2> /dev/null | sed -r 's,^ +,,g' || true`
if test -n "$objpath" ; then if test -n "$objpath" ; then
dbus-send --system --dest=org.openeulerhosted.certmonger --print-reply /org/openeulerhosted/certmonger \ dbus-send --system --dest=org.%{vendor}hosted.certmonger --print-reply /org/%{vendor}hosted/certmonger \
org.openeulerhosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null org.%{vendor}hosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
fi fi
for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do
if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then
@ -108,6 +113,9 @@ fi
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Fri Nov 18 2022 yaoxin <yaoxin30@h-partners.com> - 0.79.11-5
- Replace openeuler with vendor
* Sat Sep 11 2021 wutao <wutao61@huawei.com> - 0.79.11-4 * Sat Sep 11 2021 wutao <wutao61@huawei.com> - 0.79.11-4
- delete help package provides certmonger to solve conflicts - delete help package provides certmonger to solve conflicts