rpms/kernel/devel/scripts rebase.sh,1.25,1.26
Kyle McMartin
kyle at fedoraproject.org
Mon Feb 23 08:12:51 UTC 2009
- Previous message (by thread): rpms/kernel/devel Makefile,1.98,1.99 kernel.spec,1.1323,1.1324
- Next message (by thread): rpms/perl-NOCpulse-CLAC/devel import.log, NONE, 1.1 perl-NOCpulse-CLAC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7181/scripts
Modified Files:
rebase.sh
Log Message:
* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
- regexp-ing up with_doc turns out to be fail. define a new var
rawhide_skip_docs to 1 when we don't want to build them. tested with
upcoming patch-2.6.29-rc6.bz2...
Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rebase.sh 23 Feb 2009 07:56:14 -0000 1.25
+++ rebase.sh 23 Feb 2009 08:12:20 -0000 1.26
@@ -72,7 +72,7 @@
if [ "$OLDRC" -eq 0 -a "$OLDGIT" -eq 0 -a "$OLDGIT" -ne "$NEWGIT" ]; then
echo "Rebasing from a stable release to a new git snapshot"
perl -p -i -e 's/^%define\ released_kernel\ 1/\%define\ released_kernel\ 0/' kernel.spec
- perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
+ perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 0/' kernel.spec
# force these to zero in this case, they may not have been when we rebased to stable
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
@@ -80,18 +80,18 @@
# make sure we build docs at least once per -rc kernel, shut it off otherwise
if [ "$OLDRC" -ne 0 -a "$NEWRC" -gt "$OLDRC" ]; then
- perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
+ perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 0/' kernel.spec
else
if [ "$NEWRC" -eq "$OLDRC" -a "$NEWGIT" -gt "$OLDGIT" ]; then
# common case, same -rc, new -git, make sure docs are off.
- perl -p -i -e 's/^\#%\ define\ with_doc\ 0/\%define\ with_doc\ 0/' kernel.spec
+ perl -p -i -e 's/^%define\ rawhide_skip_docs\ 0/\%define\ rawhide_skip_docs\ 1/' kernel.spec
fi
fi
if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then
echo "Rebasing from -rc to final release."
perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec
- perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
+ perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 0/' kernel.spec
export OLD_TARBALL_BASE=$(($OLDBASE-1))
perl -p -i -e 's/^%define\ base_sublevel\ $ENV{OLD_TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
- Previous message (by thread): rpms/kernel/devel Makefile,1.98,1.99 kernel.spec,1.1323,1.1324
- Next message (by thread): rpms/perl-NOCpulse-CLAC/devel import.log, NONE, 1.1 perl-NOCpulse-CLAC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list