| [2011] | 1 | --- rpmbuild/SPECS/openafs.spec.orig    2011-10-17 23:46:35.000000000 -0400 | 
|---|
|  | 2 | +++ rpmbuild/SPECS/openafs.spec 2011-10-17 23:48:41.000000000 -0400 | 
|---|
|  | 3 | @@ -224,7 +224,7 @@ | 
|---|
|  | 4 | BuildRoot: %{_tmppath}/%{name}-%{version}-root | 
|---|
|  | 5 | Packager: OpenAFS Gatekeepers <openafs-gatekeepers@openafs.org> | 
|---|
|  | 6 | Group: Networking/Filesystems | 
|---|
|  | 7 | -BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison | 
|---|
|  | 8 | +BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison, systemd-units | 
|---|
|  | 9 | %if 0%{?fedora} | 
|---|
|  | 10 | BuildRequires: perl-devel perl-ExtUtils-Embed | 
|---|
|  | 11 | %endif | 
|---|
|  | 12 | @@ -323,6 +323,12 @@ | 
|---|
|  | 13 | %package client | 
|---|
|  | 14 | Provides: scripts-openafs-client | 
|---|
|  | 15 | Requires: binutils, openafs = %{version} | 
|---|
|  | 16 | +%if 0%{?fedora} >= 15 | 
|---|
|  | 17 | +Requires: systemd-units | 
|---|
|  | 18 | +Requires(post): systemd-units, systemd-sysv | 
|---|
|  | 19 | +Requires(preun): systemd-units | 
|---|
|  | 20 | +Requires(postun): systemd-units | 
|---|
|  | 21 | +%endif | 
|---|
|  | 22 |  | 
|---|
|  | 23 | %if %{fedorakmod} | 
|---|
|  | 24 | Requires: %{name}-kmod >= %{version} | 
|---|
|  | 25 | @@ -347,6 +353,12 @@ | 
|---|
|  | 26 | Requires: openafs = %{version} | 
|---|
|  | 27 | Summary: OpenAFS Filesystem Server | 
|---|
|  | 28 | Group: Networking/Filesystems | 
|---|
|  | 29 | +%if 0%{?fedora} >= 15 | 
|---|
|  | 30 | +Requires: systemd-units | 
|---|
|  | 31 | +Requires(post): systemd-units, systemd-sysv | 
|---|
|  | 32 | +Requires(preun): systemd-units | 
|---|
|  | 33 | +Requires(postun): systemd-units | 
|---|
|  | 34 | +%endif | 
|---|
|  | 35 |  | 
|---|
|  | 36 | %description server | 
|---|
|  | 37 | The AFS distributed filesystem.  AFS is a distributed filesystem | 
|---|
|  | 38 | @@ -999,7 +1011,12 @@ | 
|---|
|  | 39 | mkdir -p $RPM_BUILD_ROOT%{_sbindir} | 
|---|
|  | 40 | mkdir -p $RPM_BUILD_ROOT%{_libdir} | 
|---|
|  | 41 | mkdir -p $RPM_BUILD_ROOT/etc/sysconfig | 
|---|
|  | 42 | +%if 0%{?fedora} < 15 | 
|---|
|  | 43 | mkdir -p $RPM_BUILD_ROOT%{initdir} | 
|---|
|  | 44 | +%else | 
|---|
|  | 45 | +mkdir -p $RPM_BUILD_ROOT%{_unitdir} | 
|---|
|  | 46 | +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules | 
|---|
|  | 47 | +%endif | 
|---|
|  | 48 | mkdir -p $RPM_BUILD_ROOT/etc/openafs | 
|---|
|  | 49 | mkdir -p $RPM_BUILD_ROOT%{pamdir} | 
|---|
|  | 50 | mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc | 
|---|
|  | 51 | @@ -1029,8 +1046,14 @@ | 
|---|
|  | 52 |  | 
|---|
|  | 53 | # Copy root.client config files | 
|---|
|  | 54 | install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openafs | 
|---|
|  | 55 | +%if 0%{?fedora} < 15 | 
|---|
|  | 56 | install -m 755 src/packaging/RedHat/openafs-client.init $RPM_BUILD_ROOT%{initdir}/openafs-client | 
|---|
|  | 57 | install -m 755 src/packaging/RedHat/openafs-server.init $RPM_BUILD_ROOT%{initdir}/openafs-server | 
|---|
|  | 58 | +%else | 
|---|
|  | 59 | +install -m 755 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service | 
|---|
|  | 60 | +install -m 755 src/packaging/RedHat/openafs-client.modules $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/openafs-client.modules | 
|---|
|  | 61 | +install -m 755 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service | 
|---|
|  | 62 | +%endif | 
|---|
|  | 63 |  | 
|---|
|  | 64 | # Copy PAM modules | 
|---|
|  | 65 | install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir} | 
|---|
|  | 66 | @@ -1310,7 +1333,14 @@ | 
|---|
|  | 67 | fi | 
|---|
|  | 68 |  | 
|---|
|  | 69 | %post client | 
|---|
|  | 70 | +%if 0%{?fedora} < 15 | 
|---|
|  | 71 | chkconfig --add openafs-client | 
|---|
|  | 72 | +%else | 
|---|
|  | 73 | +if [ $1 -eq 1 ] ; then | 
|---|
|  | 74 | +    # Initial installation | 
|---|
|  | 75 | +    /bin/systemctl daemon-reload >/dev/null 2>&1 || : | 
|---|
|  | 76 | +fi | 
|---|
|  | 77 | +%endif | 
|---|
|  | 78 | if [ ! -d /afs ]; then | 
|---|
|  | 79 | mkdir /afs | 
|---|
|  | 80 | chown root.root /afs | 
|---|
|  | 81 | @@ -1327,10 +1357,17 @@ | 
|---|
|  | 82 |  | 
|---|
|  | 83 | %post server | 
|---|
|  | 84 | #on an upgrade, don't enable if we were disabled | 
|---|
|  | 85 | +%if 0%{?fedora} < 15 | 
|---|
|  | 86 | if [ $1 = 1 ] ; then | 
|---|
|  | 87 | chkconfig --add openafs-server | 
|---|
|  | 88 | fi | 
|---|
|  | 89 | %{initdir}/openafs-server condrestart | 
|---|
|  | 90 | +%else | 
|---|
|  | 91 | +if [ $1 -eq 1 ] ; then | 
|---|
|  | 92 | +    # Initial installation | 
|---|
|  | 93 | +    /bin/systemctl daemon-reload >/dev/null 2>&1 || : | 
|---|
|  | 94 | +fi | 
|---|
|  | 95 | +%endif | 
|---|
|  | 96 |  | 
|---|
|  | 97 | %if %{build_authlibs} | 
|---|
|  | 98 | %post authlibs | 
|---|
|  | 99 | @@ -1346,16 +1383,45 @@ | 
|---|
|  | 100 | fi | 
|---|
|  | 101 |  | 
|---|
|  | 102 | %preun client | 
|---|
|  | 103 | +%if 0%{?fedora} < 15 | 
|---|
|  | 104 | if [ $1 = 0 ] ; then | 
|---|
|  | 105 | %{initdir}/openafs-client stop | 
|---|
|  | 106 | chkconfig --del openafs-client | 
|---|
|  | 107 | fi | 
|---|
|  | 108 | +%else | 
|---|
|  | 109 | +if [ $1 -eq 0 ] ; then | 
|---|
|  | 110 | +       # Package removal, not upgrade | 
|---|
|  | 111 | +       /bin/systemctl --no-reload disable openafs-client.service > /dev/null 2>&1 || : | 
|---|
|  | 112 | +       /bin/systemctl stop openafs-client.service > /dev/null 2>&1 || : | 
|---|
|  | 113 | +fi | 
|---|
|  | 114 | +%endif | 
|---|
|  | 115 |  | 
|---|
|  | 116 | %preun server | 
|---|
|  | 117 | +%if 0%{?fedora} < 15 | 
|---|
|  | 118 | if [ $1 = 0 ] ; then | 
|---|
|  | 119 | %{initdir}/openafs-server stop | 
|---|
|  | 120 | chkconfig --del openafs-server | 
|---|
|  | 121 | fi | 
|---|
|  | 122 | +%else | 
|---|
|  | 123 | +if [ $1 -eq 0 ] ; then | 
|---|
|  | 124 | +       /bin/systemctl --no-reload disable openafs-server.service > /dev/null 2>&1 || : | 
|---|
|  | 125 | +       /bin/systemctl stop openafs-server.service > /dev/null 2>&1 || : | 
|---|
|  | 126 | +fi | 
|---|
|  | 127 | +%endif | 
|---|
|  | 128 | + | 
|---|
|  | 129 | +%postun client | 
|---|
|  | 130 | +/bin/systemctl daemon-reload >/dev/null 2>&1 || : | 
|---|
|  | 131 | +if [ $1 -ge 1 ] ; then | 
|---|
|  | 132 | +    # Package upgrade, not uninstall | 
|---|
|  | 133 | +    /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : | 
|---|
|  | 134 | +fi | 
|---|
|  | 135 | + | 
|---|
|  | 136 | +%postun server | 
|---|
|  | 137 | +/bin/systemctl daemon-reload >/dev/null 2>&1 || : | 
|---|
|  | 138 | +if [ $1 -ge 1 ] ; then | 
|---|
|  | 139 | +    # Package upgrade, not uninstall | 
|---|
|  | 140 | +    /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : | 
|---|
|  | 141 | +fi | 
|---|
|  | 142 |  | 
|---|
|  | 143 | %if %{build_dkmspkg} | 
|---|
|  | 144 | %post -n dkms-%{name} | 
|---|
|  | 145 | @@ -1413,6 +1479,32 @@ | 
|---|
|  | 146 | %endif | 
|---|
|  | 147 | %endif | 
|---|
|  | 148 |  | 
|---|
|  | 149 | +%triggerun -- openafs-client < 1.6.0-1 | 
|---|
|  | 150 | +# Save the current service runlevel info | 
|---|
|  | 151 | +# User must manually run systemd-sysv-convert --apply httpd | 
|---|
|  | 152 | +# to migrate them to systemd targets | 
|---|
|  | 153 | +/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||: | 
|---|
|  | 154 | + | 
|---|
|  | 155 | +# If the package is allowed to autostart: | 
|---|
|  | 156 | +/bin/systemctl --no-reload enable openafs-client.service >/dev/null 2>&1 ||: | 
|---|
|  | 157 | + | 
|---|
|  | 158 | +# Run these because the SysV package being removed won't do them | 
|---|
|  | 159 | +/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || : | 
|---|
|  | 160 | +/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : | 
|---|
|  | 161 | + | 
|---|
|  | 162 | +%triggerun -- openafs-server < 1.6.0-1 | 
|---|
|  | 163 | +# Save the current service runlevel info | 
|---|
|  | 164 | +# User must manually run systemd-sysv-convert --apply httpd | 
|---|
|  | 165 | +# to migrate them to systemd targets | 
|---|
|  | 166 | +/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||: | 
|---|
|  | 167 | + | 
|---|
|  | 168 | +# If the package is allowed to autostart: | 
|---|
|  | 169 | +/bin/systemctl --no-reload enable openafs-server.service >/dev/null 2>&1 ||: | 
|---|
|  | 170 | + | 
|---|
|  | 171 | +# Run these because the SysV package being removed won't do them | 
|---|
|  | 172 | +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : | 
|---|
|  | 173 | +/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : | 
|---|
|  | 174 | + | 
|---|
|  | 175 | ############################################################################## | 
|---|
|  | 176 | ### | 
|---|
|  | 177 | ### file lists | 
|---|
|  | 178 | @@ -1450,7 +1542,12 @@ | 
|---|
|  | 179 | %{pamdir}/pam_afs.krb.so | 
|---|
|  | 180 | %{pamdir}/pam_afs.so.1 | 
|---|
|  | 181 | %{pamdir}/pam_afs.so | 
|---|
|  | 182 | +%if 0%{?fedora} < 15 | 
|---|
|  | 183 | %{initdir}/openafs-client | 
|---|
|  | 184 | +%else | 
|---|
|  | 185 | +%{_unitdir}/openafs-client.service | 
|---|
|  | 186 | +%{_sysconfdir}/sysconfig/modules/openafs-client.modules | 
|---|
|  | 187 | +%endif | 
|---|
|  | 188 | %{_mandir}/man1/cmdebug.* | 
|---|
|  | 189 | %{_mandir}/man1/copyauth.* | 
|---|
|  | 190 | %{_mandir}/man1/up.* | 
|---|
|  | 191 | @@ -1498,7 +1595,11 @@ | 
|---|
|  | 192 | %{_sbindir}/vldb_check | 
|---|
|  | 193 | %{_sbindir}/vldb_convert | 
|---|
|  | 194 | %{_sbindir}/voldump | 
|---|
|  | 195 | +%if 0%{?fedora} < 15 | 
|---|
|  | 196 | %{initdir}/openafs-server | 
|---|
|  | 197 | +%else | 
|---|
|  | 198 | +%{_unitdir}/openafs-server.service | 
|---|
|  | 199 | +%endif | 
|---|
|  | 200 | %{_mandir}/man5/AuthLog.* | 
|---|
|  | 201 | %{_mandir}/man5/BackupLog.* | 
|---|
|  | 202 | %{_mandir}/man5/BosConfig.* | 
|---|