Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

  • 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 @@
    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 @@ -323,6 +323,12 @@
     13@@ -326,6 +329,12 @@
    1314 %package client
    1415 Provides: scripts-openafs-client
     
    2324 %if %{fedorakmod}
    2425 Requires: %{name}-kmod >= %{version}
    25 @@ -347,6 +353,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 @@ -999,7 +1011,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 @@ -1029,8 +1046,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 @@ -1310,7 +1333,14 @@
     67@@ -1318,7 +1344,14 @@
    6768 fi
    6869 
     
    7980        mkdir /afs
    8081        chown root.root /afs
    81 @@ -1327,10 +1357,17 @@
     82@@ -1335,10 +1368,17 @@
    8283 
    8384 %post server
     
    9798 %if %{build_authlibs}
    9899 %post authlibs
    99 @@ -1346,16 +1383,45 @@
     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 || :
    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
    135133+
    136134+%postun server
    137135+/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
    142137 
    143138 %if %{build_dkmspkg}
    144139 %post -n dkms-%{name}
    145 @@ -1413,6 +1479,32 @@
     140@@ -1421,6 +1484,26 @@
    146141 %endif
    147142 %endif
    148143 
     144+%if 0%{?fedora} >= 15
    149145+%triggerun -- openafs-client < 1.6.0-1
    150146+# Save the current service runlevel info
     
    153149+/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||:
    154150+
    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
    159152+/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || :
    160 +/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || :
    161153+
    162154+%triggerun -- openafs-server < 1.6.0-1
     
    166158+/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||:
    167159+
    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
    172161+/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || :
    173 +/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || :
     162+%endif
    174163+
    175164 ##############################################################################
    176165 ###
    177166 ### file lists
    178 @@ -1450,7 +1542,12 @@
     167@@ -1458,7 +1541,12 @@
    179168 %{pamdir}/pam_afs.krb.so
    180169 %{pamdir}/pam_afs.so.1
     
    189178 %{_mandir}/man1/copyauth.*
    190179 %{_mandir}/man1/up.*
    191 @@ -1498,7 +1595,11 @@
     180@@ -1506,7 +1594,11 @@
    192181 %{_sbindir}/vldb_check
    193182 %{_sbindir}/vldb_convert
Note: See TracChangeset for help on using the changeset viewer.