mirror of
https://git.icinga.com/packaging/rpm-icingaweb2.git
synced 2025-07-31 01:44:06 +02:00
icingaweb2: Improve dependencies and directory ownerships
This commit is contained in:
parent
2a160fedfb
commit
432f33ee0b
@ -151,6 +151,7 @@ Summary: Icinga Web 2 vendor library dompdf
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: LGPLv2.1
|
License: LGPLv2.1
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-dompdf
|
%description vendor-dompdf
|
||||||
Icinga Web 2 vendor library dompdf
|
Icinga Web 2 vendor library dompdf
|
||||||
@ -162,6 +163,7 @@ Summary: Icinga Web 2 vendor library HTMLPurifier
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: LGPLv2.1
|
License: LGPLv2.1
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-HTMLPurifier
|
%description vendor-HTMLPurifier
|
||||||
Icinga Web 2 vendor library HTMLPurifier
|
Icinga Web 2 vendor library HTMLPurifier
|
||||||
@ -172,6 +174,7 @@ Summary: Icinga Web 2 vendor library JShrink
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-JShrink
|
%description vendor-JShrink
|
||||||
Icinga Web 2 vendor library JShrink
|
Icinga Web 2 vendor library JShrink
|
||||||
@ -182,6 +185,7 @@ Summary: Icinga Web 2 vendor library lessphp
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-lessphp
|
%description vendor-lessphp
|
||||||
Icinga Web 2 vendor library lessphp
|
Icinga Web 2 vendor library lessphp
|
||||||
@ -192,6 +196,7 @@ Summary: Icinga Web 2 vendor library Parsedown
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-Parsedown
|
%description vendor-Parsedown
|
||||||
Icinga Web 2 vendor library Parsedown
|
Icinga Web 2 vendor library Parsedown
|
||||||
@ -203,6 +208,7 @@ Group: Development/Libraries
|
|||||||
License: BSD
|
License: BSD
|
||||||
Requires: %{php_common} >= %{php_version}
|
Requires: %{php_common} >= %{php_version}
|
||||||
Obsoletes: %{name}-vendor-Zend < 1.12.20
|
Obsoletes: %{name}-vendor-Zend < 1.12.20
|
||||||
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
%description vendor-zf1
|
%description vendor-zf1
|
||||||
Icinga Web 2's fork of Zend Framework 1
|
Icinga Web 2's fork of Zend Framework 1
|
||||||
@ -283,6 +289,11 @@ rm -rf %{buildroot}
|
|||||||
%{basedir}/doc
|
%{basedir}/doc
|
||||||
%{basedir}/modules
|
%{basedir}/modules
|
||||||
%{basedir}/public
|
%{basedir}/public
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
# for lint on OBS
|
||||||
|
%dir %{dirname:%{wwwconfigdir}}
|
||||||
|
%dir %{wwwconfigdir}
|
||||||
|
%endif
|
||||||
%config(noreplace) %{wwwconfigdir}/icingaweb2.conf
|
%config(noreplace) %{wwwconfigdir}/icingaweb2.conf
|
||||||
%attr(2775,root,%{icingawebgroup}) %dir %{logdir}
|
%attr(2775,root,%{icingawebgroup}) %dir %{logdir}
|
||||||
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
|
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
|
||||||
@ -299,14 +310,22 @@ exit 0
|
|||||||
|
|
||||||
%files common
|
%files common
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{basedir}/application/locale
|
%dir %{basedir}
|
||||||
|
%dir %{basedir}/application
|
||||||
|
%dir %{basedir}/library
|
||||||
|
%dir %{basedir}/library/vendor
|
||||||
%dir %{basedir}/modules
|
%dir %{basedir}/modules
|
||||||
|
%{basedir}/application/locale
|
||||||
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}
|
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}
|
||||||
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules
|
%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules
|
||||||
|
|
||||||
|
|
||||||
%files -n php-Icinga
|
%files -n php-Icinga
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
# for lint on OBS
|
||||||
|
%dir %{phpdir}
|
||||||
|
%endif
|
||||||
%{phpdir}/Icinga
|
%{phpdir}/Icinga
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user