From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 27 Mar 2015 21:22:38 +0000 (-0700)
Subject: Remove rpm/fedora directory
X-Git-Tag: zfs-0.8.0-rc1~152^2~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72998c2c9db99a7589cfd4696bd11042e262297d;p=zfs

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 <behlendorf1@llnl.gov>
---

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 82fbea0c3..058866dd6 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -229,7 +229,7 @@ AC_DEFUN([SPL_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 9746659e4..2aee70b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,6 @@ AC_CONFIG_FILES([
 	include/vm/Makefile
 	scripts/Makefile
 	rpm/Makefile
-	rpm/fedora/Makefile
-	rpm/fedora/spl.spec
-	rpm/fedora/spl-kmod.spec
-	rpm/fedora/spl-dkms.spec
 	rpm/generic/Makefile
 	rpm/generic/spl.spec
 	rpm/generic/spl-kmod.spec
diff --git a/rpm/Makefile.am b/rpm/Makefile.am
index e41cdda2e..b564eeefd 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 67129ff14..000000000
--- a/rpm/fedora/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/spl-dkms.spec
-/spl-kmod.spec
-/spl.spec
diff --git a/rpm/fedora/Makefile.am b/rpm/fedora/Makefile.am
deleted file mode 100644
index da6c4abe2..000000000
--- a/rpm/fedora/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = spl.spec.in spl-kmod.spec.in spl-dkms.spec.in
diff --git a/rpm/fedora/spl-dkms.spec.in b/rpm/fedora/spl-dkms.spec.in
deleted file mode 120000
index 900f524aa..000000000
--- a/rpm/fedora/spl-dkms.spec.in
+++ /dev/null
@@ -1 +0,0 @@
-../generic/spl-dkms.spec.in
\ No newline at end of file
diff --git a/rpm/fedora/spl-kmod.spec.in b/rpm/fedora/spl-kmod.spec.in
deleted file mode 120000
index 311c24d84..000000000
--- a/rpm/fedora/spl-kmod.spec.in
+++ /dev/null
@@ -1 +0,0 @@
-../generic/spl-kmod.spec.in
\ No newline at end of file
diff --git a/rpm/fedora/spl.spec.in b/rpm/fedora/spl.spec.in
deleted file mode 120000
index d3276f013..000000000
--- a/rpm/fedora/spl.spec.in
+++ /dev/null
@@ -1 +0,0 @@
-../generic/spl.spec.in
\ No newline at end of file