- Timestamp:
- May 22, 2012, 10:52:35 PM (12 years ago)
- Location:
- branches/fc17-dev
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/fc17-dev
- Property svn:mergeinfo changed
/trunk (added) merged: 2082-2122,2125-2148,2150-2194
- Property svn:mergeinfo changed
-
branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch
r2066 r2195 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 1 --- openafs.spec.orig 2011-12-11 04:48:08.257676312 -0500 2 +++ openafs.spec 2011-12-11 04:49:43.101175888 -0500 3 @@ -225,6 +225,9 @@ 5 4 Packager: OpenAFS Gatekeepers <openafs-gatekeepers@openafs.org> 6 5 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 6 BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison 7 +%if 0%{?fedora} >= 15 8 +BuildRequires: systemd-units 9 +%endif 9 10 %if 0%{?fedora} 10 11 BuildRequires: perl-devel perl-ExtUtils-Embed 11 12 %endif 12 @@ -32 3,6 +323,12 @@13 @@ -326,6 +329,12 @@ 13 14 %package client 14 15 Provides: scripts-openafs-client … … 23 24 %if %{fedorakmod} 24 25 Requires: %{name}-kmod >= %{version} 25 @@ -3 47,6 +353,12 @@26 @@ -350,6 +359,12 @@ 26 27 Requires: openafs = %{version} 27 28 Summary: OpenAFS Filesystem Server … … 36 37 %description server 37 38 The AFS distributed filesystem. AFS is a distributed filesystem 38 @@ - 999,7 +1011,12 @@39 @@ -1005,7 +1020,12 @@ 39 40 mkdir -p $RPM_BUILD_ROOT%{_sbindir} 40 41 mkdir -p $RPM_BUILD_ROOT%{_libdir} … … 49 50 mkdir -p $RPM_BUILD_ROOT%{pamdir} 50 51 mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc 51 @@ -10 29,8 +1046,14 @@52 @@ -1035,8 +1055,14 @@ 52 53 53 54 # Copy root.client config files … … 64 65 # Copy PAM modules 65 66 install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir} 66 @@ -131 0,7 +1333,14 @@67 @@ -1318,7 +1344,14 @@ 67 68 fi 68 69 … … 79 80 mkdir /afs 80 81 chown root.root /afs 81 @@ -13 27,10 +1357,17 @@82 @@ -1335,10 +1368,17 @@ 82 83 83 84 %post server … … 97 98 %if %{build_authlibs} 98 99 %post authlibs 99 @@ -13 46,16 +1383,45@@100 @@ -1354,16 +1394,39 @@ 100 101 fi 101 102 … … 127 128 +%endif 128 129 + 130 +%if 0%{?fedora} >= 15 129 131 +%postun client 130 132 +/bin/systemctl daemon-reload >/dev/null 2>&1 || : 131 +if [ $1 -ge 1 ] ; then132 + # Package upgrade, not uninstall133 + /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || :134 +fi135 133 + 136 134 +%postun server 137 135 +/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 136 +%endif 142 137 143 138 %if %{build_dkmspkg} 144 139 %post -n dkms-%{name} 145 @@ -14 13,6 +1479,32@@140 @@ -1421,6 +1484,26 @@ 146 141 %endif 147 142 %endif 148 143 144 +%if 0%{?fedora} >= 15 149 145 +%triggerun -- openafs-client < 1.6.0-1 150 146 +# Save the current service runlevel info … … 153 149 +/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||: 154 150 + 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 151 +# Run this because the SysV package being removed won't do it 159 152 +/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || : 160 +/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || :161 153 + 162 154 +%triggerun -- openafs-server < 1.6.0-1 … … 166 158 +/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||: 167 159 + 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 160 +# Run this because the SysV package being removed won't do it 172 161 +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : 173 + /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || :162 +%endif 174 163 + 175 164 ############################################################################## 176 165 ### 177 166 ### file lists 178 @@ -145 0,7 +1542,12 @@167 @@ -1458,7 +1541,12 @@ 179 168 %{pamdir}/pam_afs.krb.so 180 169 %{pamdir}/pam_afs.so.1 … … 189 178 %{_mandir}/man1/copyauth.* 190 179 %{_mandir}/man1/up.* 191 @@ -1 498,7 +1595,11 @@180 @@ -1506,7 +1594,11 @@ 192 181 %{_sbindir}/vldb_check 193 182 %{_sbindir}/vldb_convert
Note: See TracChangeset
for help on using the changeset viewer.