diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-01-13 14:50:04 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-01-14 10:26:11 -0500 |
| commit | cff59d3101041cbf70abd8a182390104a3852af1 (patch) | |
| tree | bcabafe5769e2e380a3bd5aa913abe82476e396f | |
| parent | 0c6639afbae54153a150751a0b62fb5588b9f9fc (diff) | |
| download | kernel-cff59d3101041cbf70abd8a182390104a3852af1.tar.gz kernel-cff59d3101041cbf70abd8a182390104a3852af1.tar.xz kernel-cff59d3101041cbf70abd8a182390104a3852af1.zip | |
Drop upstream_branch related spec stuffs
We haven't set using_upstream_branch to 1 since we started using git.
Almost 7 years is a long time to carry something around we aren't using.
Drop the upstream_branch stuff.
| -rw-r--r-- | kernel.spec | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/kernel.spec b/kernel.spec index c3e46aa7c..0dd034b31 100644 --- a/kernel.spec +++ b/kernel.spec @@ -208,16 +208,6 @@ Summary: The Linux kernel %if %{nopatches} %define with_bootwrapper 0 %define variant -vanilla -%else -%define variant_fedora -fedora -%endif - -%define using_upstream_branch 0 -%if 0%{?upstream_branch:1} -%define stable_update 0 -%define using_upstream_branch 1 -%define variant -%{upstream_branch}%{?variant_fedora} -%define pkg_release 0.%{fedora_build}%{upstream_branch_tag}%{?buildid}%{?dist} %endif %if !%{debugbuildsenabled} @@ -383,7 +373,7 @@ Summary: The Linux kernel # Should make listnewconfig fail if there's config options # printed out? -%if %{nopatches}%{using_upstream_branch} +%if %{nopatches} %define listnewconfig_fail 0 %else %define listnewconfig_fail 1 @@ -572,10 +562,6 @@ Patch00: patch-3.%{base_sublevel}-git%{gitrev}.xz %endif %endif -%if %{using_upstream_branch} -### BRANCH PATCH ### -%endif - # we also need compile fixes for -vanilla Patch04: compile-fixes.patch @@ -1021,14 +1007,12 @@ ApplyPatch() if [ ! -f $RPM_SOURCE_DIR/$patch ]; then exit 1 fi -%if !%{using_upstream_branch} if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then if [ "${patch:0:8}" != "patch-3." ] ; then echo "ERROR: Patch $patch not listed as a source patch in specfile" exit 1 fi fi 2>/dev/null -%endif case "$patch" in *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; @@ -1191,10 +1175,6 @@ ApplyPatch %{stable_patch_00} ApplyPatch %{stable_patch_01} %endif -%if %{using_upstream_branch} -### BRANCH APPLY ### -%endif - # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/config-* . cp %{SOURCE15} . |