From 551aab62b808e07531299ac6f9f049f3c0d0a6a2 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Sat, 3 May 2014 08:52:49 -0400
Subject: [PATCH] Fix up Provides on kernel-module variant packages

- Enable CONFIG_USB_UAS unconditionally per Hans
---
 Makefile         | 3 ---
 Makefile.release | 3 ---
 kernel.spec      | 8 ++++++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 13cb2e651..386683b38 100644
--- a/Makefile
+++ b/Makefile
@@ -99,9 +99,6 @@ debug:
 
 	@perl -pi -e 's/# CONFIG_MAXSMP is not set/CONFIG_MAXSMP=y/' config-x86-generic
 
-	@# Try out UAS in rawhide builds.
-	@perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
-
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 	@rpmdev-bumpspec -c "Reenable debugging options." kernel.spec
 
diff --git a/Makefile.release b/Makefile.release
index de713fcce..6ee755ec4 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -85,9 +85,6 @@ config-release:
 	@# Change defaults back to sane things.
 	@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
 
-	@# Disable UAS for release until it's ready. (#717633, #744099)
-	@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
-
 	@perl -pi -e 's/CONFIG_SCHEDSTATS=y/# CONFIG_SCHEDSTATS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' config-nodebug
 
diff --git a/kernel.spec b/kernel.spec
index f58df424d..178d6555e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -34,7 +34,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -866,7 +866,7 @@ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
 Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
 Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
 Provides: installonlypkg(kernel-module)\
-Provides: kernel-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
 AutoReqProv: no\
 %description -n kernel%{?variant}%{?1:-%{1}}-modules\
@@ -2214,6 +2214,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat May 03 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix up Provides on kernel-module variant packages
+- Enable CONFIG_USB_UAS unconditionally per Hans
+
 * Fri May 02 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc3.git4.1
 - Linux v3.15-rc3-121-gb7270cce7db7