From ed81373f8d1f55f5318b067be42807db2202940b3579fc7ec87b44328f82b90a Mon Sep 17 00:00:00 2001
From: Christof Hanke <christof.hanke@mpcdf.mpg.de>
Date: Tue, 30 Apr 2019 12:46:43 +0000
Subject: [PATCH] - fix broken directory layout - fix broken post-install
 script

OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=39
---
 dir_layout.patch | 18 ++++++++++++------
 openafs.changes  |  2 ++
 openafs.spec     | 18 ++++++++----------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/dir_layout.patch b/dir_layout.patch
index b3ec3c7..2f9e0bc 100644
--- a/dir_layout.patch
+++ b/dir_layout.patch
@@ -1,11 +1,17 @@
---- openafs-1.8.2/src/cf/dirpaths.m4.orig	2019-01-16 11:16:56.160768067 +0100
-+++ openafs-1.8.2/src/cf/dirpaths.m4	2019-01-16 11:17:49.300846193 +0100
-@@ -21,7 +21,7 @@
+--- openafs-1.8.3/src/cf/dirpaths.m4.orig	2019-04-30 13:38:33.411870333 +0200
++++ openafs-1.8.3/src/cf/dirpaths.m4	2019-04-30 13:48:06.182604169 +0200
+@@ -20,10 +20,10 @@
+     afssrvbindir=${afssrvbindir='${bindir}'}
      afssrvsbindir=${afssrvsbindir='${sbindir}'}
      afssrvlibexecdir=${afssrvlibexecdir='${libexecdir}/openafs'}
-     afsdbdir=${afsdbdir='${localstatedir}/openafs/db'}
+-    afsdbdir=${afsdbdir='${localstatedir}/openafs/db'}
 -    afslogsdir=${afslogsdir='${localstatedir}/openafs/logs'}
+-    afslocaldir=${afslocaldir='${localstatedir}/openafs'}
+-    afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
++    afsdbdir=${afsdbdir='/var/lib/openafs/db'}
 +    afslogsdir=${afslogsdir='/var/log/openafs'}
-     afslocaldir=${afslocaldir='${localstatedir}/openafs'}
-     afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
++    afslocaldir=${afslocaldir='/var/lib/openafs'}
++    afsbackupdir=${afsbackupdir='/var/lib/openafs/backup'}
      afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'}
+     afsdatadir=${afsdatadir='${datadir}/openafs'}
+ fi
diff --git a/openafs.changes b/openafs.changes
index bd29fdb..efc296d 100644
--- a/openafs.changes
+++ b/openafs.changes
@@ -3,6 +3,8 @@ Tue Apr 30 10:17:44 UTC 2019 - Christof Hanke <christof.hanke@mpcdf.mpg.de>
 
 - update to 1.8.3
 - Require krb5-client for package openafs-client 
+- fix broken directory layout
+- fix broken post-install script
 
 -------------------------------------------------------------------
 Mon Mar 25 11:32:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
diff --git a/openafs.spec b/openafs.spec
index c58fb36..3ed1ad3 100644
--- a/openafs.spec
+++ b/openafs.spec
@@ -307,12 +307,10 @@ done
 
 %setup -q -n openafs-%{upstream_version} -T -b 0 -b 1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 
-%if %{run_regen}
-%patch4 -p1
- ./regen.sh
-%endif
+./regen.sh
 
 %build
 # architecture specific settings
@@ -642,14 +640,14 @@ fi
 %{fillup_only -n openafs-server}
 %service_add_post openafs-server.service
 
-if [ "x$1" = "x" ]; then
-    my_operation=0
-else
-    my_operation=$1
-fi
-if [ $my_operation -gt 1 ]; then
+if [ "$FIRST_ARG" -gt 1 ]; then
+    # update no new install
     echo Not stopping the possibly running services.
     echo You must restart the service to put the upgrade into effect.
+    if [ -d /var/openafs ]; then
+         echo To upgrade, stop the server, copy the contents of /var/openafs to /var/lib/openafs,
+         echo remove the empty directory /var/openafs and then start the server again. 
+    fi
 else 
     echo For configuring the server, please check /etc/sysconfig/openafs-server
     echo and/or follow the instructions found on http://www.openafs.org to install an openafs-client.