rpm/rrdtool
SHA256
1
0
Fork 0
forked from pool/rrdtool
Code Pull Requests Activity

Accepting request 556699 from devel:languages:python

Browse Source 
We needed this in Factory >20 days ago for the fillup-templates change. Manually submitting.

OBS-URL: https://build.opensuse.org/request/show/556699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2017-12-16 19:47:08 +00:00 committed by Git OBS Bridge
commit fde2b08904
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rrdtool.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:53:48 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 24 12:14:04 UTC 2017 - dimstar@opensuse.org Mon Jul 24 12:14:04 UTC 2017 - dimstar@opensuse.org

9
rrdtool.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%bcond_without lua %bcond_without lua
%bcond_without python %bcond_without python
%bcond_without ruby %bcond_without ruby
@ -286,7 +291,7 @@ rm %{buildroot}%{_docdir}/%{name}/txt/*.pod
find %{buildroot}%{_docdir}/%{name}/examples/ -type f -exec chmod 0644 "{}" "+" find %{buildroot}%{_docdir}/%{name}/examples/ -type f -exec chmod 0644 "{}" "+"
# install rrdcached specials # install rrdcached specials
install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.rrdcached
# install systemd specific files # install systemd specific files
install -D -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre install -D -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
@ -380,7 +385,7 @@ getent passwd %{rrdcached_user} >/dev/null || useradd -s /sbin/nologin -g %{rrdc
%{_mandir}/man1/rrdcached* %{_mandir}/man1/rrdcached*
%{_bindir}/rrdcached %{_bindir}/rrdcached
%{_sbindir}/rcrrdcached %{_sbindir}/rcrrdcached
%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached %{_fillupdir}/sysconfig.rrdcached
%{_datadir}/rrdcached %{_datadir}/rrdcached
%{_datadir}/rrdcached/rrdcached-systemd-pre %{_datadir}/rrdcached/rrdcached-systemd-pre
%{_unitdir}/rrdcached.service %{_unitdir}/rrdcached.service