rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Drop upstream_branch related spec stuffs

Browse Source 
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.
This commit is contained in:
Josh Boyer 2014-01-13 14:50:04 -05:00
parent 0c6639afba
commit cff59d3101
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel.spec
View File

@ -208,16 +208,6 @@ Summary: The Linux kernel
%if %{nopatches} %if %{nopatches}
%define with_bootwrapper 0 %define with_bootwrapper 0
%define variant -vanilla %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 %endif
%if !%{debugbuildsenabled} %if !%{debugbuildsenabled}
@ -383,7 +373,7 @@ Summary: The Linux kernel
# Should make listnewconfig fail if there's config options # Should make listnewconfig fail if there's config options
# printed out? # printed out?
%if %{nopatches}%{using_upstream_branch} %if %{nopatches}
%define listnewconfig_fail 0 %define listnewconfig_fail 0
%else %else
%define listnewconfig_fail 1 %define listnewconfig_fail 1
@ -572,10 +562,6 @@ Patch00: patch-3.%{base_sublevel}-git%{gitrev}.xz
%endif %endif
%endif %endif
%if %{using_upstream_branch}
### BRANCH PATCH ###
%endif
# we also need compile fixes for -vanilla # we also need compile fixes for -vanilla
Patch04: compile-fixes.patch Patch04: compile-fixes.patch
@ -1021,14 +1007,12 @@ ApplyPatch()
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1 exit 1
fi fi
%if !%{using_upstream_branch}
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
if [ "${patch:0:8}" != "patch-3." ] ; then if [ "${patch:0:8}" != "patch-3." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile" echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1 exit 1
fi fi
fi 2>/dev/null fi 2>/dev/null
%endif
case "$patch" in case "$patch" in
*.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
*.gz) gunzip < "$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} ApplyPatch %{stable_patch_01}
%endif %endif
%if %{using_upstream_branch}
### BRANCH APPLY ###
%endif
# Drop some necessary files from the source dir into the buildroot # Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* . cp $RPM_SOURCE_DIR/config-* .
cp %{SOURCE15} . cp %{SOURCE15} .