Accepting request 320144 from devel:languages:python
- Do not hard-depend on systemd, the macros support soft fails. - Ignore errors from useradd/groupadd - Update RPM groups - Ignore absence of systemd-tmpfiles, it won't be present in the build env. OBS-URL: https://build.opensuse.org/request/show/320144 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=59
This commit is contained in:
commit
964b781b0a
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 31 18:07:53 UTC 2015 - jengelh@inai.de
|
||||||
|
|
||||||
|
- Do not hard-depend on systemd, the macros support soft fails.
|
||||||
|
- Ignore errors from useradd/groupadd
|
||||||
|
- Update RPM groups
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 31 09:53:10 UTC 2015 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Ignore absence of systemd-tmpfiles, it won't be present in the
|
||||||
|
build env.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Mar 10 11:26:06 UTC 2015 - p.drouand@gmail.com
|
Tue Mar 10 11:26:06 UTC 2015 - p.drouand@gmail.com
|
||||||
|
|
||||||
|
22
rrdtool.spec
22
rrdtool.spec
@ -35,9 +35,9 @@ BuildRequires: lua51-devel
|
|||||||
BuildRequires: pango-devel
|
BuildRequires: pango-devel
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: ruby-devel
|
BuildRequires: ruby-devel
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: tcl-devel
|
BuildRequires: tcl-devel
|
||||||
BuildRequires: tcpd-devel
|
BuildRequires: tcpd-devel
|
||||||
BuildRequires: pkgconfig(systemd)
|
|
||||||
Requires: perl = %{perl_version}
|
Requires: perl = %{perl_version}
|
||||||
Version: 1.4.7
|
Version: 1.4.7
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -71,7 +71,7 @@ definable time period.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: A tool for data logging and analysis - Development files
|
Summary: A tool for data logging and analysis - Development files
|
||||||
Group: Development/Libraries/Other
|
Group: Development/Libraries/C and C++
|
||||||
Requires: %name = %version
|
Requires: %name = %version
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -82,7 +82,7 @@ definable time period.
|
|||||||
|
|
||||||
%package -n python-rrdtool
|
%package -n python-rrdtool
|
||||||
Summary: Python bindings for rrdtool
|
Summary: Python bindings for rrdtool
|
||||||
Group: Productivity/Scientific/Math
|
Group: Development/Languages/Python
|
||||||
Requires: %name = %version
|
Requires: %name = %version
|
||||||
%py_requires
|
%py_requires
|
||||||
|
|
||||||
@ -97,7 +97,7 @@ This package contains the Python bindings
|
|||||||
|
|
||||||
%package -n lua-rrdtool
|
%package -n lua-rrdtool
|
||||||
Summary: Lua bindings for rrdtool
|
Summary: Lua bindings for rrdtool
|
||||||
Group: Productivity/Scientific/Math
|
Group: Development/Languages/Other
|
||||||
Requires: %name = %version
|
Requires: %name = %version
|
||||||
|
|
||||||
%description -n lua-rrdtool
|
%description -n lua-rrdtool
|
||||||
@ -110,7 +110,7 @@ This package contains the Lua bindings
|
|||||||
|
|
||||||
%package -n ruby-rrdtool
|
%package -n ruby-rrdtool
|
||||||
Summary: Ruby bindings for rrdtool
|
Summary: Ruby bindings for rrdtool
|
||||||
Group: Productivity/Scientific/Math
|
Group: Development/Languages/Ruby
|
||||||
Requires: ruby(abi) >= %{rb_ver}
|
Requires: ruby(abi) >= %{rb_ver}
|
||||||
|
|
||||||
%description -n ruby-rrdtool
|
%description -n ruby-rrdtool
|
||||||
@ -123,7 +123,7 @@ This package contains the Ruby bindings
|
|||||||
|
|
||||||
%package -n tcl-rrdtool
|
%package -n tcl-rrdtool
|
||||||
Summary: Tcl bindings for rrdtool
|
Summary: Tcl bindings for rrdtool
|
||||||
Group: Productivity/Scientific/Math
|
Group: Development/Languages/Tcl
|
||||||
Requires: tcl
|
Requires: tcl
|
||||||
|
|
||||||
%description -n tcl-rrdtool
|
%description -n tcl-rrdtool
|
||||||
@ -139,7 +139,6 @@ Summary: Data caching daemon for RRDtool
|
|||||||
Group: Productivity/Scientific/Math
|
Group: Productivity/Scientific/Math
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
Requires(pre): %fillup_prereq
|
Requires(pre): %fillup_prereq
|
||||||
%{?systemd_requires}
|
|
||||||
%define rrdcached_user rrdcached
|
%define rrdcached_user rrdcached
|
||||||
%define rrdcached_group rrdcached
|
%define rrdcached_group rrdcached
|
||||||
|
|
||||||
@ -311,17 +310,20 @@ chmod 644 %{buildroot}/%{_tmpfilesdir}/rrdcached.conf
|
|||||||
%{_datadir}/rrdcached
|
%{_datadir}/rrdcached
|
||||||
%{_datadir}/rrdcached/rrdcached-systemd-pre
|
%{_datadir}/rrdcached/rrdcached-systemd-pre
|
||||||
%{_unitdir}/rrdcached.service
|
%{_unitdir}/rrdcached.service
|
||||||
|
%if 0%{?suse_version} <= 1320
|
||||||
|
%dir %_prefix/lib/tmpfiles.d
|
||||||
|
%endif
|
||||||
%{_tmpfilesdir}/rrdcached.conf
|
%{_tmpfilesdir}/rrdcached.conf
|
||||||
|
|
||||||
%pre cached
|
%pre cached
|
||||||
getent group %rrdcached_group >/dev/null || groupadd %rrdcached_group
|
getent group %rrdcached_group >/dev/null || groupadd %rrdcached_group || :
|
||||||
getent passwd %rrdcached_user >/dev/null || useradd -s /sbin/nologin -g %rrdcached_group -c %rrdcached_user -d %{_localstatedir}/lib %rrdcached_user
|
getent passwd %rrdcached_user >/dev/null || useradd -s /sbin/nologin -g %rrdcached_group -c %rrdcached_user -d %{_localstatedir}/lib %rrdcached_user || :
|
||||||
%service_add_pre rrdcached.service
|
%service_add_pre rrdcached.service
|
||||||
|
|
||||||
%post cached
|
%post cached
|
||||||
%service_add_post rrdcached.service
|
%service_add_post rrdcached.service
|
||||||
%fillup_only rrdcached
|
%fillup_only rrdcached
|
||||||
systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf
|
systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf || :
|
||||||
|
|
||||||
%preun cached
|
%preun cached
|
||||||
%service_del_preun rrdcached.service
|
%service_del_preun rrdcached.service
|
||||||
|
Loading…
Reference in New Issue
Block a user