From d820d2e9cf27678dd07b86f8fdd4635162371a37 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 27 Mar 2015 14:30:23 -0700 Subject: [PATCH] Remove rpm/fedora directory Originally it was thought that custom spec files might be required for Fedora. Happily that has turns out not to be the case. Since this directory just contains symlinks to the generic spec files it can be removed. Signed-off-by: Brian Behlendorf --- config/zfs-build.m4 | 2 +- configure.ac | 4 ---- rpm/Makefile.am | 2 +- rpm/fedora/.gitignore | 3 --- rpm/fedora/Makefile.am | 1 - rpm/fedora/zfs-dkms.spec.in | 1 - rpm/fedora/zfs-kmod.spec.in | 1 - rpm/fedora/zfs.spec.in | 1 - 8 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 rpm/fedora/.gitignore delete mode 100644 rpm/fedora/Makefile.am delete mode 120000 rpm/fedora/zfs-dkms.spec.in delete mode 120000 rpm/fedora/zfs-kmod.spec.in delete mode 120000 rpm/fedora/zfs.spec.in diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 4c8bddf2f2..73ba979d10 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -151,7 +151,7 @@ AC_DEFUN([ZFS_AC_RPM], [ RPM_SPEC_DIR="rpm/generic" AC_ARG_WITH([spec], AS_HELP_STRING([--with-spec=SPEC], - [Spec files 'generic|fedora']), + [Spec files 'generic']), [RPM_SPEC_DIR="rpm/$withval"]) AC_MSG_CHECKING([whether spec files are available]) diff --git a/configure.ac b/configure.ac index e0829205af..854af771c0 100644 --- a/configure.ac +++ b/configure.ac @@ -134,10 +134,6 @@ AC_CONFIG_FILES([ scripts/zpool-config/Makefile scripts/common.sh rpm/Makefile - rpm/fedora/Makefile - rpm/fedora/zfs.spec - rpm/fedora/zfs-kmod.spec - rpm/fedora/zfs-dkms.spec rpm/generic/Makefile rpm/generic/zfs.spec rpm/generic/zfs-kmod.spec diff --git a/rpm/Makefile.am b/rpm/Makefile.am index e41cdda2e9..b564eeefd9 100644 --- a/rpm/Makefile.am +++ b/rpm/Makefile.am @@ -1 +1 @@ -SUBDIRS = fedora generic +SUBDIRS = generic diff --git a/rpm/fedora/.gitignore b/rpm/fedora/.gitignore deleted file mode 100644 index 7f5daafdd6..0000000000 --- a/rpm/fedora/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/zfs-dkms.spec -/zfs-kmod.spec -/zfs.spec diff --git a/rpm/fedora/Makefile.am b/rpm/fedora/Makefile.am deleted file mode 100644 index 89b13640d6..0000000000 --- a/rpm/fedora/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in diff --git a/rpm/fedora/zfs-dkms.spec.in b/rpm/fedora/zfs-dkms.spec.in deleted file mode 120000 index ffa051baaf..0000000000 --- a/rpm/fedora/zfs-dkms.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/zfs-dkms.spec.in \ No newline at end of file diff --git a/rpm/fedora/zfs-kmod.spec.in b/rpm/fedora/zfs-kmod.spec.in deleted file mode 120000 index af19ecde00..0000000000 --- a/rpm/fedora/zfs-kmod.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/zfs-kmod.spec.in \ No newline at end of file diff --git a/rpm/fedora/zfs.spec.in b/rpm/fedora/zfs.spec.in deleted file mode 120000 index 4c8079166f..0000000000 --- a/rpm/fedora/zfs.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/zfs.spec.in \ No newline at end of file