Changeset 2195 for branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/fedora/specs/openafs-systemd.spec.patch (modified) (11 diffs)

branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch

@@ -1 @@
---- rpmbuild/SPECS/openafs.spec.orig    2011-10-17 23:46:35.000000000 -0400
-+++ rpmbuild/SPECS/openafs.spec 2011-10-17 23:48:41.000000000 -0400
-@@ -224,7 +224,7 @@
- BuildRoot: %{_tmppath}/%{name}-%{version}-root
+--- openafs.spec.orig   2011-12-11 04:48:08.257676312 -0500
++++ openafs.spec        2011-12-11 04:49:43.101175888 -0500
+@@ -225,6 +225,9 @@
  Packager: OpenAFS Gatekeepers <openafs-gatekeepers@openafs.org>
  Group: Networking/Filesystems
--BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison
-+BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison, systemd-units
+ BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison
++%if 0%{?fedora} >= 15
++BuildRequires: systemd-units
++%endif
  %if 0%{?fedora}
  BuildRequires: perl-devel perl-ExtUtils-Embed
  %endif
-@@ -323,6 +323,12 @@
+@@ -326,6 +329,12 @@
  %package client
  Provides: scripts-openafs-client
@@ -23 +24 @@
  %if %{fedorakmod}
  Requires: %{name}-kmod >= %{version}
-@@ -347,6 +353,12 @@
+@@ -350,6 +359,12 @@
  Requires: openafs = %{version}
  Summary: OpenAFS Filesystem Server
@@ -36 +37 @@
  %description server
  The AFS distributed filesystem.  AFS is a distributed filesystem
-@@ -999,7 +1011,12 @@
+@@ -1005,7 +1020,12 @@
  mkdir -p $RPM_BUILD_ROOT%{_sbindir}
  mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -49 +50 @@
  mkdir -p $RPM_BUILD_ROOT%{pamdir}
  mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc
-@@ -1029,8 +1046,14 @@
+@@ -1035,8 +1055,14 @@
  
  # Copy root.client config files
@@ -64 +65 @@
  # Copy PAM modules
  install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir}
-@@ -1310,7 +1333,14 @@
+@@ -1318,7 +1344,14 @@
  fi
  
@@ -79 +80 @@
         mkdir /afs
         chown root.root /afs
-@@ -1327,10 +1357,17 @@
+@@ -1335,10 +1368,17 @@
  
  %post server
@@ -97 +98 @@
  %if %{build_authlibs}
  %post authlibs
-@@ -1346,16 +1383,45 @@
+@@ -1354,16 +1394,39 @@
  fi
  
@@ -127 +128 @@
 +%endif
 +
++%if 0%{?fedora} >= 15
 +%postun client
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+if [ $1 -ge 1 ] ; then
-+    # Package upgrade, not uninstall
-+    /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || :
-+fi
 +
 +%postun server
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+if [ $1 -ge 1 ] ; then
-+    # Package upgrade, not uninstall
-+    /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || :
-+fi
++%endif
  
  %if %{build_dkmspkg}
  %post -n dkms-%{name}
-@@ -1413,6 +1479,32 @@
+@@ -1421,6 +1484,26 @@
  %endif
  %endif
  
++%if 0%{?fedora} >= 15
 +%triggerun -- openafs-client < 1.6.0-1
 +# Save the current service runlevel info
@@ -153 +149 @@
 +/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||:
 +
-+# If the package is allowed to autostart:
-+/bin/systemctl --no-reload enable openafs-client.service >/dev/null 2>&1 ||:
-+
-+# Run these because the SysV package being removed won't do them
++# Run this because the SysV package being removed won't do it
 +/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || :
-+/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : 
 +
 +%triggerun -- openafs-server < 1.6.0-1
@@ -166 +158 @@
 +/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||:
 +
-+# If the package is allowed to autostart:
-+/bin/systemctl --no-reload enable openafs-server.service >/dev/null 2>&1 ||:
-+
-+# Run these because the SysV package being removed won't do them
++# Run this because the SysV package being removed won't do it
 +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || :
-+/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : 
++%endif
 +
  ##############################################################################
  ###
  ### file lists
-@@ -1450,7 +1542,12 @@
+@@ -1458,7 +1541,12 @@
  %{pamdir}/pam_afs.krb.so
  %{pamdir}/pam_afs.so.1
@@ -189 +178 @@
  %{_mandir}/man1/copyauth.*
  %{_mandir}/man1/up.*
-@@ -1498,7 +1595,11 @@
+@@ -1506,7 +1594,11 @@
  %{_sbindir}/vldb_check
  %{_sbindir}/vldb_convert