diff options
| -rw-r--r-- | config/zfs-build.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | rpm/Makefile.am | 2 | ||||
| -rw-r--r-- | rpm/fedora/.gitignore | 3 | ||||
| -rw-r--r-- | rpm/fedora/Makefile.am | 1 | ||||
| l--------- | rpm/fedora/zfs-dkms.spec.in | 1 | ||||
| l--------- | rpm/fedora/zfs-kmod.spec.in | 1 | ||||
| l--------- | rpm/fedora/zfs.spec.in | 1 |
8 files changed, 2 insertions, 13 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 4c8bddf2f..73ba979d1 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 e0829205a..854af771c 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 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 7f5daafdd..000000000 --- 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 89b13640d..000000000 --- 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 ffa051baa..000000000 --- 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 af19ecde0..000000000 --- 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 4c8079166..000000000 --- a/rpm/fedora/zfs.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/zfs.spec.in
\ No newline at end of file |