1
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
2
index 1939ca8..3e92c98 100644
3
--- a/packages/redhat/cloud-init.spec.in
4
+++ b/packages/redhat/cloud-init.spec.in
5
@@ -1,10 +1,12 @@
6
1
## template: cheetah
1
## template: cheetah
7
2
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
2
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
8
3
3
12
4
%if %{undefined systemd_requires}
4
%define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7)
13
5
%define init_system sysvinit
5
14
6
%else
6
%if %{use_systemd}
15
7
%define init_system systemd
7
%define init_system systemd
16
8
%else
17
9
%define init_system sysvinit
18
8
%endif
10
%endif
19
9
11
20
10
# See: http://www.zarb.org/~jasonc/macros.php
12
# See: http://www.zarb.org/~jasonc/macros.php
21
@@ -29,6 +31,18 @@ BuildRequires:  python-setuptools
22
29
%if "%{?el6}" == "1"
31
%if "%{?el6}" == "1"
23
30
BuildRequires:  python-argparse
32
BuildRequires:  python-argparse
24
31
%endif
33
%endif
25
34
%if %{use_systemd}
26
35
Requires:           systemd
27
36
BuildRequires:      systemd
28
37
Requires:           systemd-units
29
38
BuildRequires:      systemd-units
30
39
%else
31
40
Requires:           initscripts >= 8.36
32
41
Requires(postun):   initscripts
33
42
Requires(post):     chkconfig
34
43
Requires(preun):    chkconfig
35
44
%endif
36
45
37
32
# These are runtime dependencies, but declared as BuildRequires so that
46
# These are runtime dependencies, but declared as BuildRequires so that
38
33
# - tests can be run here.
47
# - tests can be run here.
39
34
# - parts of cloud-init such (setup.py) use these dependencies.
48
# - parts of cloud-init such (setup.py) use these dependencies.
40
@@ -68,8 +82,9 @@ Patch${size}: $p
41
68
#end for
82
#end for
42
69
83
43
70
%if "%{init_system}" == "systemd"
84
%if "%{init_system}" == "systemd"
46
71
BuildRequires:  systemd-units
85
Requires(post):       systemd
47
72
%{systemd_requires}
86
Requires(preun):      systemd
48
87
Requires(postun):     systemd
49
73
%else
88
%else
50
74
Requires(post):       chkconfig
89
Requires(post):       chkconfig
51
75
Requires(postun):     initscripts
90
Requires(postun):     initscripts
Status:	Merged
Merged at revision:	b9cd8a82ee41e235df66801a02b2244226bee5ee
Proposed branch:	~raharper/cloud-init:redhat-fix-spec-systemd
Merge into:	cloud-init:master
Diff against target:	51 lines (+20/-5) 1 file modified packages/redhat/cloud-init.spec.in (+20/-5)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2017-06-09
Scott Moser		2017-06-09	Approve on 2017-06-09
Review via email: mp+325402@code.launchpad.net
1	diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
2	index 1939ca8..3e92c98 100644
3	--- a/packages/redhat/cloud-init.spec.in
4	+++ b/packages/redhat/cloud-init.spec.in
5	@@ -1,10 +1,12 @@
6	1	## template: cheetah	1	## template: cheetah
7	2	%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}	2	%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
8	3		3
12	4	%if %{undefined systemd_requires}	4	%define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) \|\| (0%{?rhel} && 0%{?rhel} >= 7)
13	5	%define init_system sysvinit	5
14	6	%else	6	%if %{use_systemd}
15	7	%define init_system systemd	7	%define init_system systemd
16			8	%else
17			9	%define init_system sysvinit
18	8	%endif	10	%endif
19	9		11
20	10	# See: http://www.zarb.org/~jasonc/macros.php	12	# See: http://www.zarb.org/~jasonc/macros.php
21	@@ -29,6 +31,18 @@ BuildRequires: python-setuptools
22	29	%if "%{?el6}" == "1"	31	%if "%{?el6}" == "1"
23	30	BuildRequires: python-argparse	32	BuildRequires: python-argparse
24	31	%endif	33	%endif
25			34	%if %{use_systemd}
26			35	Requires: systemd
27			36	BuildRequires: systemd
28			37	Requires: systemd-units
29			38	BuildRequires: systemd-units
30			39	%else
31			40	Requires: initscripts >= 8.36
32			41	Requires(postun): initscripts
33			42	Requires(post): chkconfig
34			43	Requires(preun): chkconfig
35			44	%endif
36			45
37	32	# These are runtime dependencies, but declared as BuildRequires so that	46	# These are runtime dependencies, but declared as BuildRequires so that
38	33	# - tests can be run here.	47	# - tests can be run here.
39	34	# - parts of cloud-init such (setup.py) use these dependencies.	48	# - parts of cloud-init such (setup.py) use these dependencies.
40	@@ -68,8 +82,9 @@ Patch${size}: $p
41	68	#end for	82	#end for
42	69		83
43	70	%if "%{init_system}" == "systemd"	84	%if "%{init_system}" == "systemd"
46	71	BuildRequires: systemd-units	85	Requires(post): systemd
47	72	%{systemd_requires}	86	Requires(preun): systemd
48			87	Requires(postun): systemd
49	73	%else	88	%else
50	74	Requires(post): chkconfig	89	Requires(post): chkconfig
51	75	Requires(postun): initscripts	90	Requires(postun): initscripts