Changeset 2090 for trunk/server


Ignore:
Timestamp:
Dec 11, 2011, 4:57:37 AM (11 years ago)
Author:
geofft
Message:
openafs.spec: Incorporate upstream fix to systemd-ized specfile

Taken from commit 47b010d1e1d0e8bdbbcad73d5aedc19719d5d96a "redhat: make
rpms build on pre-f15 again", aka http://gerrit.openafs.org/5813 .

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 @@
    54 Packager: OpenAFS Gatekeepers <openafs-gatekeepers@openafs.org>
    65 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
    910 %if 0%{?fedora}
    1011 BuildRequires: perl-devel perl-ExtUtils-Embed
    1112 %endif
    12 @@ -326,6 +326,12 @@
     13@@ -326,6 +329,12 @@
    1314 %package client
    1415 Provides: scripts-openafs-client
     
    2324 %if %{fedorakmod}
    2425 Requires: %{name}-kmod >= %{version}
    25 @@ -350,6 +356,12 @@
     26@@ -350,6 +359,12 @@
    2627 Requires: openafs = %{version}
    2728 Summary: OpenAFS Filesystem Server
     
    3637 %description server
    3738 The AFS distributed filesystem.  AFS is a distributed filesystem
    38 @@ -1005,7 +1017,12 @@
     39@@ -1005,7 +1020,12 @@
    3940 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
    4041 mkdir -p $RPM_BUILD_ROOT%{_libdir}
     
    4950 mkdir -p $RPM_BUILD_ROOT%{pamdir}
    5051 mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc
    51 @@ -1035,8 +1052,14 @@
     52@@ -1035,8 +1055,14 @@
    5253 
    5354 # Copy root.client config files
     
    6465 # Copy PAM modules
    6566 install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir}
    66 @@ -1318,7 +1341,14 @@
     67@@ -1318,7 +1344,14 @@
    6768 fi
    6869 
     
    7980        mkdir /afs
    8081        chown root.root /afs
    81 @@ -1335,10 +1365,17 @@
     82@@ -1335,10 +1368,17 @@
    8283 
    8384 %post server
     
    9798 %if %{build_authlibs}
    9899 %post authlibs
    99 @@ -1354,16 +1391,37 @@
     100@@ -1354,16 +1394,39 @@
    100101 fi
    101102 
     
    127128+%endif
    128129+
     130+%if 0%{?fedora} >= 15
    129131+%postun client
    130132+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
     
    132134+%postun server
    133135+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
     136+%endif
    134137 
    135138 %if %{build_dkmspkg}
    136139 %post -n dkms-%{name}
    137 @@ -1421,6 +1479,24 @@
     140@@ -1421,6 +1484,26 @@
    138141 %endif
    139142 %endif
    140143 
     144+%if 0%{?fedora} >= 15
    141145+%triggerun -- openafs-client < 1.6.0-1
    142146+# Save the current service runlevel info
     
    156160+# Run this because the SysV package being removed won't do it
    157161+/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || :
     162+%endif
    158163+
    159164 ##############################################################################
    160165 ###
    161166 ### file lists
    162 @@ -1458,7 +1534,12 @@
     167@@ -1458,7 +1541,12 @@
    163168 %{pamdir}/pam_afs.krb.so
    164169 %{pamdir}/pam_afs.so.1
     
    173178 %{_mandir}/man1/copyauth.*
    174179 %{_mandir}/man1/up.*
    175 @@ -1506,7 +1587,11 @@
     180@@ -1506,7 +1594,11 @@
    176181 %{_sbindir}/vldb_check
    177182 %{_sbindir}/vldb_convert
Note: See TracChangeset for help on using the changeset viewer.