Index: server/fedora/Makefile
===================================================================
--- server/fedora/Makefile	(revision 503)
+++ server/fedora/Makefile	(revision 507)
@@ -38,6 +38,4 @@
 server_url	= "http://web.mit.edu/scripts/src"
 server_arch	= "fedora.stable"
-
-openafs_rpm_args = -E "%define kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
 
 .PHONY: minimal-clean
@@ -118,9 +116,13 @@
 $(allsrc): setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-	rpmbuild -ba ${tmp_specs}/$@*.spec
+	rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@*.spec
 
 openafs-kernel: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-	rpmbuild $(openafs_rpm_args) -bb --define "build_userspace 0" --define "build_modules 1" ${tmp_specs}/openafs*.spec
+	rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/openafs*.spec
+
+openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants ''" --define "kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
+openafs: rpmbuild_args += $(openafs_rpmbuild_args)
+openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 
 suexec: install-srpms
Index: server/fedora/meta-patches/openafs-client.init.patch
===================================================================
--- server/fedora/meta-patches/openafs-client.init.patch	(revision 503)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- openafs-client.init	2007-01-14 01:49:13.288731294 -0500
-+++ openafs-client.init	2007-01-14 01:49:48.044846780 -0500
-@@ -39,6 +39,8 @@
- 	fi
- 	/usr/vice/etc/afsd $AFSD_ARGS
- 	RETVAL=$?
-+	/usr/bin/fs setcrypt on
-+	/usr/bin/fs sysname 'i386_rhel3' 'i386_rh9' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' 'i386_linux1'
- 	echo
- 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openafs-client
- 	return $RETVAL
Index: server/fedora/specs/openafs.spec.patch
===================================================================
--- server/fedora/specs/openafs.spec.patch	(revision 503)
+++ server/fedora/specs/openafs.spec.patch	(revision 507)
@@ -10,5 +10,5 @@
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -556,6 +558,10 @@
+@@ -556,6 +558,8 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -16,6 +16,4 @@
 +%patch1000 -p1 -b .scripts
 +
-+grep -rl '#include <linux/config.h>' . | xargs perl -pi -e's,#include <linux/config.h>,/* #include <linux/config.h> */,'
-+
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
  %patch0 -p1 -b .kmod26