From ade6249915c9f082f0cba7b4f89c7478ab6c9dba Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 7 Jun 2019 16:11:30 +0100 Subject: [PATCH] Use the filesystem-afs package to provide /afs on Fedora Use the filesystem-afs subpackage to provide and maintain the /afs directory on Fedora rather than doing it here as it will cause the upgrade to fail if the newer package also provides /afs. Signed-off-by: David Howells --- Makefile | 1 - redhat/kafs-client.spec | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index cd5d88b..cff3865 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,6 @@ install: all $(INSTALL) -D -m 0644 conf/kafs-config.service $(DESTDIR)$(UNITDIR)/kafs-config.service $(INSTALL) -D -m 0644 conf/afs.mount $(DESTDIR)$(UNITDIR)/afs.mount $(MKDIR) -m755 $(DESTDIR)$(ETCDIR)/kafs/client.d - $(MKDIR) -m755 $(DESTDIR)/afs ############################################################################### # diff --git a/redhat/kafs-client.spec b/redhat/kafs-client.spec index 2831ab1..42dcd55 100644 --- a/redhat/kafs-client.spec +++ b/redhat/kafs-client.spec @@ -5,11 +5,12 @@ Name: kafs-client Version: 0.1 Release: 1%{?dist}%{?buildid} -Summary: The basic tools for kAFS and the /afs dynamic root +Summary: The basic tools for kAFS and mounter for the AFS dynamic root License: GPLv2+ URL: https://www.infradead.org/~dhowells/kafs/ Source0: https://www.infradead.org/~dhowells/kafs/kafs-client-%{version}.tar.bz2 +Requires: filesystem-afs BuildRequires: krb5-devel BuildRequires: keyutils-libs-devel BuildRequires: openssl-devel @@ -55,12 +56,12 @@ filesystem. These provide things like configuration parsing and DNS lookups. # needs to be uninstalled be able to install OpenAFS or Auristor. # %package compat -Summary: AFS compatibility package, providing access through /afs +Summary: AFS compatibility package Requires: %{name}%{?_isa} = %{version}-%{release} %description compat -Compatibility package providing standard AFS names for tools and locations such -as /afs and aklog. This package must be uninstalled for kAFS to coexist with +Compatibility package providing standard AFS names for tools such as +aklog. This package must be uninstalled for kAFS to coexist with another AFS implementation (such as OpenAFS). %define _hardened_build 1 @@ -116,7 +117,6 @@ ln -s aklog-kafs %{buildroot}/%{_bindir}/aklog %files %doc README %license LICENCE.GPL -/afs %{_bindir}/aklog-kafs %{_sbindir}/kafs-check-config %{_unitdir}/* -- 2.49.0