From a1ea1912ccc79e0ee4be468045ac604a5c1aa074 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Aug 03 2021 10:26:48 +0000
Subject: Move afs into main package


---

diff --git a/filesystem.spec b/filesystem.spec
index 327a8a8..33c1a7f 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 3.14
+Version: 3.15
 Release: 1%{?dist}
 License: Public Domain
 URL: https://pagure.io/filesystem
@@ -11,6 +11,9 @@ Source3: iso_3166.sed
 BuildRequires: iso-codes
 Requires(pre): setup
 
+Provides:   filesystem-afs = %{version}-%{release}
+Obsoletes:  filesystem-afs <= 3.14-2
+
 %description
 The filesystem package is one of the basic packages that is installed
 on a Linux system. Filesystem contains the basic directory layout
@@ -26,15 +29,6 @@ This subpackage of filesystem package contains just the file with
 the directories owned by the filesystem package. This can be used
 during the build process instead of calling rpm -ql filesystem.
 
-%package afs
-Summary: AFS root directory from the filesystem package
-License: Public Domain
-
-%description afs
-This subpackage of filesystem package contains just the AFS filesystem
-dynamic root directory.  This can be used with packages that add an
-AFS client.
-
 %prep
 rm -f $RPM_BUILD_DIR/filelist
 
@@ -177,22 +171,20 @@ restorecon /sys 2>/dev/null >/dev/null || :
 restorecon /boot 2>/dev/null >/dev/null || :
 restorecon /dev 2>/dev/null >/dev/null || :
 restorecon /media 2>/dev/null >/dev/null || :
-
-%posttrans afs
 restorecon /afs 2>/dev/null >/dev/null || :
 
 %files content
 %dir %{_datadir}/filesystem
 %{_datadir}/filesystem/paths
 
-%files afs
-%attr(555,root,root) /afs
+
 
 %files -f filelist
 %defattr(0755,root,root,0755)
 %dir %attr(555,root,root) /
 /bin
 %attr(555,root,root) /boot
+%attr(555,root,root) /afs
 /dev
 %dir /etc
 /etc/X11
@@ -309,6 +301,9 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
+* Tue Aug  3 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.15-1
+- Move /afs into main package
+
 * Mon Jan 27 2020 Ondrej Vasik <ovasik@redhat.com> - 3.14-1
 - do not restore context of /proc (#1722766)