--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/03/23 05:51:18	1.8
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/06/30 17:15:21	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 28
+%define release 32
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -11,13 +11,27 @@ Group: SMEserver/addon
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
-Requires: e-smith-release >= 9.0
+Requires: e-smith-release >= 10.0
 AutoReqProv: no
 
 %description
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Wed Jun 30 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-32.sme
+- Requires e-smith >= 10
+- exclude pwauh from EPEL [SME: 11639]
+
+* Sun May 02 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-31.sme
+- add perl-JSON to openfusion [SME: 11579]
+
+* 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
+
 * Mon Mar 22 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-28.sme
 - add extra packages from openfusion [SME: 11223] 
 - fix wrong event for remi-unsafe  [SME: 11181] 
@@ -135,10 +149,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
@@ -161,6 +174,7 @@ return 0
 #####################
 #####################
 REPO['reponame']='atomic'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Atomic'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -179,6 +193,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='centos-sclo-centos'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -197,6 +212,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='centos-sclo-rh'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Centos-RH Software collections'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -215,6 +231,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='egroupware'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='server_eGroupWare'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -235,6 +252,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'
@@ -254,6 +272,7 @@ done
 #####################
 #####################
 REPO['reponame']='elrepo'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -272,6 +291,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='elrepo-kernel'
+REPO['pkgname']='elrepo'
 REPO['fullreponame']='ELRepo.org Community Enterprise Linux Repository Kernel'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -290,6 +310,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='epel'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='EPEL'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -298,7 +319,7 @@ REPO['BaseURL']='http://download.fedorap
 REPO['MirrorList']='http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch'
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-REPO['Exclude']='perl-Razor-Agent'
+REPO['Exclude']='perl-Razor-Agent,pwauth'
 REPO['IncludePkgs']=''
 createrepo
 
@@ -308,6 +329,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='erlang'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='erlang programming language'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -326,6 +348,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='freeswitch'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Freeswitch'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -344,6 +367,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Firewall Services'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -362,6 +386,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='fws-testing'
+REPO['pkgname']='fws'
 REPO['fullreponame']='Firewall Services testing'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -380,6 +405,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='libreswan'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Libreswan'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -400,6 +426,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'
@@ -413,133 +440,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
 #####################
@@ -548,6 +448,7 @@ if  ( "%{?dist}"  == "el7" ); then
 #####################
 #####################
 REPO['reponame']='odoo10-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 10 Nightly - EL7'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -566,6 +467,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='odoo9-nightly'
+REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 9 Nightly - EL7'
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -585,6 +487,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'
@@ -603,6 +506,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='openfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Openfusion'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -612,7 +516,7 @@ REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
 REPO['GPGKey']='http://repo.openfusion.net/RPM-GPG-KEY-openfusion'
 REPO['Exclude']='perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-ExtUtils-Install,perl-parent'
-REPO['IncludePkgs']='perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny'
+REPO['IncludePkgs']='perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny,perl-JSON'
 createrepo
 
 #####################
@@ -622,6 +526,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'
@@ -638,6 +543,7 @@ createrepo
 
 
 REPO['reponame']="pgsql$pgsqlver-nonfree"
+REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -653,6 +559,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']="pgsql$pgsqlver-common"
+REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
 REPO['Visible']='no'
@@ -675,6 +582,7 @@ done
 #####################
 #####################
 REPO['reponame']='reetp'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Mirror John Crisp reetspetit.com'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -693,6 +601,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'
@@ -711,6 +620,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-ocsinventory'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi ocsinventory - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -729,6 +639,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='remi-roundcube'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Remi Roundcube - EL'
 REPO['EnableGroups']='no'
 REPO['GPGCheck']='yes'
@@ -748,6 +659,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='rpmfusion free EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -766,6 +678,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='rpmfusion-nonfree'
+REPO['pkgname']='rpmfusion'
 REPO['fullreponame']='rpmfusion nonfree EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -784,6 +697,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Inverse SOGo 2 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -802,6 +716,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo3'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 3 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -820,6 +735,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo4'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo 4 Repository'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -838,6 +754,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='sogo-subscription'
+REPO['pkgname']='sogo'
 REPO['fullreponame']='Inverse SOGo Repository only with subscription'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -856,6 +773,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='spectrum2'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Spectrum2'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -874,6 +792,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='springdale-core'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Base'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -887,6 +806,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS core Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -900,6 +820,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-addons'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -913,6 +834,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-addons-updates'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Addons Updates'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -927,6 +849,7 @@ createrepo
 
 
 REPO['reponame']='springdale-unsupported'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Unsupported'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -940,6 +863,7 @@ REPO['IncludePkgs']=''
 createrepo
 
 REPO['reponame']='springdale-computational'
+REPO['pkgname']='springdale'
 REPO['fullreponame']='PUIAS Computational'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -961,6 +885,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='stephdl'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Mirror Stephane de Labrusse'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -979,6 +904,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='virtualbox'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='RHEL/CentOS VirtualBox'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -997,6 +923,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='webtatic'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='webtatic - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1019,6 +946,7 @@ createrepo
 #####################
 #####################
 REPO['reponame']='xymon'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Xymon Terabithia RPMS - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'
@@ -1036,9 +964,10 @@ createrepo
 #Zabbix2.4
 #####################
 #####################
-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')
-for elasver  in "4.2" "4.4" ; do
+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'
@@ -1046,7 +975,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
@@ -1058,6 +987,7 @@ done
 #####################
 #####################
 REPO['reponame']='zmrepo'
+REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='ZoneMinder Repo - EL'
 REPO['EnableGroups']='no'
 REPO['Visible']='yes'