icingaweb2 update to version 2.12.1

Signed-off-by: monitorbuilder_pel7ppc64lebuilder0 <monitorbuilder@powerel.org>

SPECS/icingaweb2.spec

@@ -14,7 +14,7 @@
 %define docsdir          %{_datadir}/doc/%{name}
 
 Name:           icingaweb2
-Version:        2.11.4
+Version:        2.12.1
 Release:        1%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
@@ -35,15 +35,10 @@ Requires:       %{php}-ldap
 Requires(pre):  shadow-utils
 Requires:       php >= %{php_version}
 Requires:       php-common >= %{php_version}
-Requires:       icinga-l10n
+Requires:       icinga-l10n >= 1.0.0
 Requires:       icingacli = %{version}-%{release}
 Requires:       %{name}-common = %{version}-%{release}
-Requires:       php-Icinga = %{version}-%{release}
+Requires:       php-icinga = %{version}-%{release}
-Requires:       %{name}-vendor-dompdf = %{version}-%{release}
-Requires:       %{name}-vendor-HTMLPurifier = 1:%{version}-%{release}
-Requires:       %{name}-vendor-JShrink = %{version}-%{release}
-Requires:       %{name}-vendor-lessphp = %{version}-%{release}
-Requires:       %{name}-vendor-Parsedown = %{version}-%{release}
 
 
 %description
@@ -58,7 +53,7 @@ Requires(pre):          shadow-utils
 Common files for Icinga Web 2 and the Icinga CLI
 
 
-%package -n php-Icinga
+%package -n php-icinga
 Summary:                Icinga Web 2 PHP library
 Group:                  Development/Libraries
 Requires:               php-common >= %{php_version}
@@ -66,9 +61,9 @@ Requires:               php-gd
 Requires:               php-intl
 Requires:               php-mbstring
 Requires:               php-json
-Requires:               %{name}-vendor-zf1 = %{version}-%{release}
 #Requires:              php-pecl-imagick
-%description -n php-Icinga
+Provides:               php-Icinga
+%description -n php-icinga
 Icinga Web 2 PHP library
 
 
@@ -77,7 +72,7 @@ Summary:                    Icinga CLI
 Group:                      Applications/System
 Requires:                   icinga-l10n
 Requires:                   %{name}-common = %{version}-%{release}
-Requires:                   php-Icinga = %{version}-%{release}
+Requires:                   php-icinga = %{version}-%{release}
 Requires:                   bash-completion
 Requires:                   php-cli >= %{php_version}
 %description -n icingacli
@@ -95,68 +90,6 @@ Requires(postun):   policycoreutils
 SELinux policy for Icinga Web 2
 
 
-%package vendor-dompdf
-Summary:    Icinga Web 2 vendor library dompdf
-Group:      Development/Libraries
-License:    LGPLv2.1
-Requires:   php-common >= %{php_version}
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-dompdf
-Icinga Web 2 vendor library dompdf
-
-
-%package vendor-HTMLPurifier
-Epoch:      1
-Summary:    Icinga Web 2 vendor library HTMLPurifier
-Group:      Development/Libraries
-License:    LGPLv2.1
-Requires:   php-common >= %{php_version}
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-HTMLPurifier
-Icinga Web 2 vendor library HTMLPurifier
-
-
-%package vendor-JShrink
-Summary:    Icinga Web 2 vendor library JShrink
-Group:      Development/Libraries
-License:    BSD
-Requires:   php-common >= %{php_version}
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-JShrink
-Icinga Web 2 vendor library JShrink
-
-
-%package vendor-lessphp
-Summary:    Icinga Web 2 vendor library lessphp
-Group:      Development/Libraries
-License:    MIT
-Requires:   php-common >= %{php_version}
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-lessphp
-Icinga Web 2 vendor library lessphp
-
-
-%package vendor-Parsedown
-Summary:    Icinga Web 2 vendor library Parsedown
-Group:      Development/Libraries
-License:    MIT
-Requires:   php-common >= %{php_version}
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-Parsedown
-Icinga Web 2 vendor library Parsedown
-
-
-%package vendor-zf1
-Summary:    Icinga Web 2's fork of Zend Framework 1
-Group:      Development/Libraries
-License:    BSD
-Requires:   php-common >= %{php_version}
-Obsoletes:  %{name}-vendor-Zend < 1.12.20
-Requires:   %{name}-common = %{version}-%{release}
-%description vendor-zf1
-Icinga Web 2's fork of Zend Framework 1
-
-
 %prep
 %setup -q
 mkdir selinux
@@ -183,7 +116,6 @@ cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}
-cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor
 cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public
 cp -pv %{SOURCE5} %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
 cp -pv %{SOURCE4} %{buildroot}/%{bindir}
@@ -200,8 +132,6 @@ do
   install -p -m 644 icingaweb2.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp
 done
 cd -
-# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11
-#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
 
 
 %pre
@@ -227,10 +157,6 @@ rm -rf %{buildroot}
 %{basedir}/public
 %config(noreplace) %{wwwconfigdir}/icingaweb2.conf
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
-#%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
-#%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini
-#%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/translation
-#%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/translation/config.ini
 %{docsdir}
 %docdir %{docsdir}
 
@@ -252,7 +178,7 @@ exit 0
 %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules
 
 
-%files -n php-Icinga
+%files -n php-icinga
 %defattr(-,root,root)
 %{phpdir}/Icinga
 
@@ -290,36 +216,4 @@ fi
 %{_datadir}/selinux/*/icingaweb2.pp
 
 
-%files vendor-dompdf
-%defattr(-,root,root)
-%{basedir}/library/vendor/dompdf
-
-
-%files vendor-HTMLPurifier
-%defattr(-,root,root)
-%{basedir}/library/vendor/HTMLPurifier
-%{basedir}/library/vendor/HTMLPurifier.autoload.php
-%{basedir}/library/vendor/HTMLPurifier.php
-
-
-%files vendor-JShrink
-%defattr(-,root,root)
-%{basedir}/library/vendor/JShrink
-
-
-%files vendor-lessphp
-%defattr(-,root,root)
-%{basedir}/library/vendor/lessphp
-
-
-%files vendor-Parsedown
-%defattr(-,root,root)
-%{basedir}/library/vendor/Parsedown
-
-
-%files vendor-zf1
-%defattr(-,root,root)
-%{basedir}/library/vendor/Zend
-
-
 %changelog