--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/03/25 06:13:40	1.9
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/03/26 05:52:14	1.10
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 29
+%define release 30
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,10 @@ AutoReqProv: no
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Thu Mar 25 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-30.sme
+- fix zabbix key
+- fix update event for packages with multiple repo 
+
 * Thu Mar 25 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-29.sme
 - add new zabbix version
 
@@ -138,10 +142,9 @@ echo "${REPO['fullreponame']}" > $RPM_BU
 echo "${REPO['Visible']}" > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/Visible
 echo "${REPO['status']}"  > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/status
 echo "repository" > $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/type
-unsafe="";
-[[ "${REPO['reponame']}" == 'remi' ]] &&  unsafe="-unsafe"
-mkdir -p $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['reponame']}$unsafe-update/templates2expand/etc/yum.smerepos.d/
-touch $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['reponame']}$unsafe-update/templates2expand/etc/yum.smerepos.d/sme-base.repo
+
+mkdir -p $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['pkgname']}-update/templates2expand/etc/yum.smerepos.d/
+touch $RPM_BUILD_ROOT/etc/e-smith/events/smeserver-extrarepositories-${REPO['pkgname']}-update/templates2expand/etc/yum.smerepos.d/sme-base.repo
 
 [[ "${REPO['BaseURL']}" != '' ]]  &&       echo "${REPO['BaseURL']}" >\
                 $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/defaults/${REPO['reponame']}/BaseURL
@@ -164,6 +167,7 @@ return 0
 #####################
 #####################
 REPO['reponame']='atomic'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Atomic'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -182,6 +186,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='centos-sclo-centos'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -200,6 +205,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='centos-sclo-rh'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -218,6 +224,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='egroupware'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='server_eGroupWare'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -238,6 +245,7 @@ createrepo
 declare -A elashort=( ['6.x']='6.x' ['5.x']='5.x' ['1.6']='1' )
 for elasver  in "6.x" "5.x" "1.6"; do 
 REPO['reponame']="elastic${elashort[$elasver]}"
+REPO['pkgname']='elastic'
 REPO['fullreponame']="Elasticsearch repository for $elasver packages"
 REPO['EnableGroups']='yes'
 REPO['Visible']='yes'
@@ -257,6 +265,7 @@ done
 #####################
 #####################
 REPO['reponame']='elrepo'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -275,6 +284,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='elrepo-kernel'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository Kernel'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -293,6 +303,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='epel'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='EPEL'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -311,6 +322,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='erlang'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='erlang programming language'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -329,6 +341,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='freeswitch'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Freeswitch'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -347,6 +360,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Firewall Services'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -365,6 +379,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws-testing'
+REPO['pkgname']='fws'
 REPO['fullreponame']='Firewall Services testing'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -383,6 +398,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='libreswan'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Libreswan'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -403,6 +419,7 @@ createrepo
 #####################
 for nodever  in "4" "5" "6" "7" "8" "9" "10" "11"; do
 REPO['reponame']="node$nodever"
+REPO['pkgname']='node'
 REPO['fullreponame']="NodeJS $nodever"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -416,133 +433,6 @@ REPO['IncludePkgs']=''
 createrepo
 done
 
-#####################
-#####################
-# NodeJS 5
-#####################
-#####################
-REPO['reponame']='node5'
-REPO['fullreponame']='NodeJS 5'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_5.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-createrepo
-
-#####################
-#####################
-# NodeJS 6
-#####################
-#####################
-REPO['reponame']='node6'
-REPO['fullreponame']='NodeJS 6'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_6.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-#####################
-#####################
-# NodeJS 7
-#####################
-#####################
-REPO['reponame']='node7'
-REPO['fullreponame']='NodeJS 7'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_7.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-#####################
-#####################
-# NodeJS
-#####################
-#####################
-REPO['reponame']='node8'
-REPO['fullreponame']='NodeJS 8'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_8.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-#####################
-#####################
-# NodeJS 9
-#####################
-#####################
-REPO['reponame']='node9'
-REPO['fullreponame']='NodeJS 9'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_9.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-#####################
-#####################
-# NodeJS 10
-#####################
-#####################
-REPO['reponame']='node10'
-REPO['fullreponame']='NodeJS 10'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_10.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-#####################
-#####################
-# NodeJS 11
-#####################
-#####################
-REPO['reponame']='node11'
-REPO['fullreponame']='NodeJS 11'
-REPO['EnableGroups']='no'
-REPO['Visible']='no'
-REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_11.x/el/$releasever/$basearch/'
-REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-REPO['Exclude']=''
-REPO['IncludePkgs']=''
-#createrepo
-
-
 
 if  ( "%{?dist}"  == "el7" ); then
 #####################
@@ -551,6 +441,7 @@ if  ( "%{?dist}"  == "el7" ); then
 #####################
 #####################
 REPO['reponame']='odoo10-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 10 Nightly - EL7'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -569,6 +460,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='odoo9-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 9 Nightly - EL7'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -588,6 +480,7 @@ fi
 #####################
 #####################
 REPO['reponame']='okay'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Extra OKay Packages for Enterprise Linux - Freeswitch and FusionPBX'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -606,6 +499,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='openfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Openfusion'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -625,6 +519,7 @@ createrepo
 #####################
 for pgsqlver  in  "9.6" "10" "11" "12" "13"; do
 REPO['reponame']="pgsql$pgsqlver"
+REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -641,6 +536,7 @@ createrepo
 
 
 REPO['reponame']="pgsql$pgsqlver-nonfree"
+REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -656,6 +552,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']="pgsql$pgsqlver-common"
+REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -678,6 +575,7 @@ done
 #####################
 #####################
 REPO['reponame']='reetp'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Mirror John Crisp reetspetit.com'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -696,6 +594,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi'
+REPO['pkgname']='remi-unsafe'
 REPO['fullreponame']='Remi - EL unsafe, will conflict with your base rpms'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -714,6 +613,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-ocsinventory'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi ocsinventory - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -732,6 +632,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-roundcube'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi Roundcube - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -751,6 +652,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='rpmfusion free EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -769,6 +671,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion-nonfree'
+REPO['pkgname']='rpmfusion'
 REPO['fullreponame']='rpmfusion nonfree EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -787,6 +690,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Inverse SOGo 2 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -805,6 +709,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo3'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 3 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -823,6 +728,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo4'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 4 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -841,6 +747,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo-subscription'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo Repository only with subscription'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -859,6 +766,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='spectrum2'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Spectrum2'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -877,6 +785,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='springdale-core'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Base'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -890,6 +799,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -903,6 +813,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-addons'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -916,6 +827,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-addons-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -930,6 +842,7 @@ createrepo
 
 
 REPO['reponame']='springdale-unsupported'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Unsupported'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -943,6 +856,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-computational'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Computational'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -964,6 +878,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='stephdl'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Mirror Stephane de Labrusse'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -982,6 +897,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='virtualbox'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='RHEL/CentOS VirtualBox'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1000,6 +916,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='webtatic'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='webtatic - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1022,6 +939,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='xymon'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Xymon Terabithia RPMS - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1042,6 +960,7 @@ createrepo
 declare -A zabshort=( ['1.8']='18' ['2.0']='20' ['2.0']='20' ['2.4']='24' ['3.0']='30' ['3.2']='32' ['3.4']='34' ['4.0']='40' ['4.2']='42' ['4.4']='44' ['4.5']='45' ['5.0']='50' ['5.1']='51' ['5.2']='52' ['5.3']='53')
 for elasver  in "4.2" "4.4"  '4.5' '5.0' '5.1' '5.2' '5.3'; do
 REPO['reponame']="zabbix${zabshort[$elasver]}"
+REPO['pkgname']='zabbix'
 REPO['fullreponame']="Zabbix $elasver Official Repository"
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1049,7 +968,7 @@ REPO['status']='disabled'
 REPO['BaseURL']="http://repo.zabbix.com/zabbix/$elasver/rhel/\$releasever/\$basearch/"
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX"
+REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 createrepo
@@ -1061,6 +980,7 @@ done
 #####################
 #####################
 REPO['reponame']='zmrepo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='ZoneMinder Repo - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'