diff options
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-systemd-unidir-in-spec-file.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-systemd-unidir-in-spec-file.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-systemd-unidir-in-spec-file.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-systemd-unidir-in-spec-file.patch deleted file mode 100644 index d856faf42..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-systemd-unidir-in-spec-file.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | autofs-5.0.7 - fix systemd unidir in spec file | ||
2 | |||
3 | From: Ian Kent <raven@themaw.net> | ||
4 | |||
5 | |||
6 | --- | ||
7 | CHANGELOG | 1 + | ||
8 | autofs.spec | 16 ++++++++-------- | ||
9 | 2 files changed, 9 insertions(+), 8 deletions(-) | ||
10 | |||
11 | diff --git a/CHANGELOG b/CHANGELOG | ||
12 | index b6b2679..ecdea0b 100644 | ||
13 | --- a/CHANGELOG | ||
14 | +++ b/CHANGELOG | ||
15 | @@ -35,6 +35,7 @@ | ||
16 | - add symlink pseudo option. | ||
17 | - fix requires in spec file. | ||
18 | - fix libtirpc build option to require libtirpc-devel if needed. | ||
19 | +- fix systemd unidir in spec file. | ||
20 | |||
21 | 25/07/2012 autofs-5.0.7 | ||
22 | ======================= | ||
23 | diff --git a/autofs.spec b/autofs.spec | ||
24 | index f77acc1..a768e44 100644 | ||
25 | --- a/autofs.spec | ||
26 | +++ b/autofs.spec | ||
27 | @@ -76,7 +76,7 @@ inkludera n | ||
28 | %setup -q | ||
29 | echo %{version}-%{release} > .version | ||
30 | %if %{with_systemd} | ||
31 | - %define _unitdir %{?_unitdir:/lib/systemd/system} | ||
32 | + %define unitdir %{?_unitdir:/lib/systemd/system} | ||
33 | %define systemd_configure_arg --with-systemd | ||
34 | %endif | ||
35 | %if %{with_libtirpc} | ||
36 | @@ -95,7 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1 | ||
37 | %install | ||
38 | rm -rf $RPM_BUILD_ROOT | ||
39 | %if %{with_systemd} | ||
40 | -install -d -m 755 $RPM_BUILD_ROOT%{_unitdir} | ||
41 | +install -d -m 755 $RPM_BUILD_ROOT%{unitdir} | ||
42 | %else | ||
43 | mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d | ||
44 | %endif | ||
45 | @@ -109,9 +109,13 @@ make install mandir=%{_mandir} initdir=/etc/rc.d/init.d INSTALLROOT=$RPM_BUILD_R | ||
46 | echo make -C redhat | ||
47 | make -C redhat | ||
48 | %if %{with_systemd} | ||
49 | -install -m 644 redhat/autofs.service $RPM_BUILD_ROOT%{_unitdir}/autofs.service | ||
50 | +# Configure can get this wrong when the unit files appear under /lib and /usr/lib | ||
51 | +find $RPM_BUILD_ROOT -type f -name autofs.service -exec rm -f {} \; | ||
52 | +install -m 644 redhat/autofs.service $RPM_BUILD_ROOT%{unitdir}/autofs.service | ||
53 | +%define init_file_name %{unitdir}/autofs.service | ||
54 | %else | ||
55 | install -m 755 redhat/autofs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs | ||
56 | +%define init_file_name /etc/rc.d/init.d/autofs | ||
57 | %endif | ||
58 | install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs | ||
59 | |||
60 | @@ -170,11 +174,7 @@ fi | ||
61 | %files | ||
62 | %defattr(-,root,root) | ||
63 | %doc CREDITS CHANGELOG INSTALL COPY* README* samples/ldap* samples/autofs.schema samples/autofs_ldap_auth.conf | ||
64 | -%if %{with_systemd} | ||
65 | -%{_unitdir}/autofs.service | ||
66 | -%else | ||
67 | -%config /etc/rc.d/init.d/autofs | ||
68 | -%endif | ||
69 | +%config %{init_file_name} | ||
70 | %config(noreplace) /etc/auto.master | ||
71 | %config(noreplace,missingok) /etc/auto.misc | ||
72 | %config(noreplace,missingok) /etc/auto.net | ||