Changeset 2090 for trunk/server/fedora/specs
- Timestamp:
- Dec 11, 2011, 4:57:37 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/specs/openafs-systemd.spec.patch
r2089 r2090 1 --- openafs.spec.orig 2011-12-11 03:16:10.725175932 -0500 2 +++ openafs.spec 2011-12-11 04:22:10.313676135 -0500 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 @@ -326,6 +32 6,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 @@ -350,6 +35 6,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 @@ -1005,7 +10 17,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 @@ -1035,8 +105 2,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 @@ -1318,7 +134 1,14 @@67 @@ -1318,7 +1344,14 @@ 67 68 fi 68 69 … … 79 80 mkdir /afs 80 81 chown root.root /afs 81 @@ -1335,10 +136 5,17 @@82 @@ -1335,10 +1368,17 @@ 82 83 83 84 %post server … … 97 98 %if %{build_authlibs} 98 99 %post authlibs 99 @@ -1354,16 +139 1,37@@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 || : … … 132 134 +%postun server 133 135 +/bin/systemctl daemon-reload >/dev/null 2>&1 || : 136 +%endif 134 137 135 138 %if %{build_dkmspkg} 136 139 %post -n dkms-%{name} 137 @@ -1421,6 +14 79,24@@140 @@ -1421,6 +1484,26 @@ 138 141 %endif 139 142 %endif 140 143 144 +%if 0%{?fedora} >= 15 141 145 +%triggerun -- openafs-client < 1.6.0-1 142 146 +# Save the current service runlevel info … … 156 160 +# Run this because the SysV package being removed won't do it 157 161 +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : 162 +%endif 158 163 + 159 164 ############################################################################## 160 165 ### 161 166 ### file lists 162 @@ -1458,7 +15 34,12 @@167 @@ -1458,7 +1541,12 @@ 163 168 %{pamdir}/pam_afs.krb.so 164 169 %{pamdir}/pam_afs.so.1 … … 173 178 %{_mandir}/man1/copyauth.* 174 179 %{_mandir}/man1/up.* 175 @@ -1506,7 +15 87,11 @@180 @@ -1506,7 +1594,11 @@ 176 181 %{_sbindir}/vldb_check 177 182 %{_sbindir}/vldb_convert
Note: See TracChangeset
for help on using the changeset viewer.