Merge branch 'rpm/release' into rpm/snapshot

This commit is contained in:
Markus Frosch 2017-10-02 11:21:19 +02:00
commit 612e0043a9
1 changed files with 16 additions and 1 deletions

View File

@ -17,7 +17,7 @@
# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
# ******************************************************************************/
%define revision 1
%define revision 2
# make sure that _rundir is working on older systems
%if ! %{defined _rundir}
@ -379,6 +379,13 @@ make install \
install -D -m 0644 %{SOURCE1} %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf
%endif
# install custom limits.conf for systemd
%if 0%{?configure_systemd_limits}
# for > 2.8 or > 2.7.2
#install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %%{buildroot}/etc/systemd/system/%%{name}.service.d/limits.conf
install -D -m 0644 %{SOURCE1} %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf
%endif
# remove features-enabled symlinks
rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
@ -754,3 +761,11 @@ fi
%{_datadir}/nano/%{name}.nanorc
%changelog
* Tue Sep 20 2017 Markus Frosch <markus.frosch@icinga.com> 2.7.1-2
- Fixing systemd limit issues on openSUSE > 42.1
* Thu Sep 21 2017 Michael Friedrich <michael.friedrich@icinga.com> 2.7.1-1
- Update to 2.7.1
* Tue Jun 20 2017 Markus Frosch <markus.frosch@icinga.com> 2.7.0-1
- Update to 2.7.0