#!/bin/ksh
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License Version 2.
+#
# -----------
# Exit codes:
# 0 - succesful
RCSID='$Id$'
r=${RCSID#* * }
rev=${r%% *}
-VERSION="v0.18/$rev"
+VERSION="v0.21/$rev"
VERSIONSTRING="\
Build package utility from PLD Linux CVS repository
$VERSION (C) 1999-2007 Free Penguins".
NOCVSSPEC=""
NODIST=""
NOINIT=""
+PREFMIRRORS=""
UPDATE=""
ADD5=""
NO5=""
ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
CVSROOT=""
+GREEDSRC=""
+
+# use rpm 4.4.6+ digest format instead of comments if non-zero
+USEDIGEST=
# user agent when fetching files
USER_AGENT="PLD/Builder($VERSION)"
# should the specfile be restored if upgrade failed?
REVERT_BROKEN_UPGRADE="yes"
-if [ -x /usr/bin/rpm-getdeps ]; then
- FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
-else
+if rpm --specsrpm 2>/dev/null; then
+ FETCH_BUILD_REQUIRES_RPMSPECSRPM="yes"
FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+else
+ FETCH_BUILD_REQUIRES_RPMSPECSRPM="no"
+ if [ -x /usr/bin/rpm-getdeps ]; then
+ FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
+ else
+ FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+ fi
fi
+
# Here we load saved user environment used to
# predefine options set above, or passed to builder
# in command line.
[-g|--get] [-h|--help] [--http] [{-l|--logtofile} <logfile>] [-m|--mr-proper]
[-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T|--tag <cvstag>]
[-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version]
-[{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
+[{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}] [--use-greed-sources]
[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--short-circuit]
[--show-bconds] [--with/--without <feature>] [--define <macro> <value>]
<package>[.spec][:cvstag]
--short-circuit - short-circuit build
-B, --branch - add branch
-c, --clean - clean all temporarily created files (in BUILD, SOURCES,
- SPECS and \$RPM_BUILD_ROOT),
+ SPECS and \$RPM_BUILD_ROOT and CVS/Entries) after rpmbuild commands.
+-m, --mr-proper - clean all temporarily created files (in BUILD, SOURCES,
+ SPECS and \$RPM_BUILD_ROOT and CVS/Entries). Doesn't run
+ any rpm building.
-cf, --cvs-force - use -F when tagging (useful when moving branches)
-d <cvsroot>, --cvsroot <cvsroot>
- setup \$CVSROOT,
--define <macro> <value>
- define a macro <macro> with value <value>,
+--alt_kernel <kernel>
+ - same as --define 'alt_kernel <kernel>'
--nodeps - rpm won't check any dependences
-g, --get - get <package>.spec and all related files from CVS repo
or HTTP/FTP,
--http - use http instead of ftp,
-l <logfile>, --logtofile <logfile>
- log all to file,
--m, --mr-proper - only remove all files related to spec file and all work
- resources,
-nc, --no-cvs - don't download sources from CVS, if source URL is given,
-ncs, --no-cvs-specs
- don't check specs in CVS
-ns, --no-srcs - don't download Sources
-ns0, --no-source0 - don't download Source0
-nn, --no-net - don't download anything from the net
+-pm, --prefer-mirrors - prefer mirrors (if any) over distfiles for SOURCES
--no-init - don't initialize builder paths (SPECS and SOURCES)
-ske,
--skip-existing-files - skip existing files in get_files
-u, --try-upgrade - check version, and try to upgrade package
-un, --try-upgrade-with-float-version
- as above, but allow float version
+--use-greed-sources
+ - try download source from tag head if don't find it in
+ current tag
-U, --update - refetch sources, don't use distfiles, and update md5 comments
-Upi, --update-poldek-indexes
- refresh or make poldek package index files.
"
}
+# change dependency to specname
+# common changes:
+# - perl(Package::Name) -> perl-Package-Name
+depspecname() {
+ local package="$1"
+
+ package=$(echo "$package" | sed -e '/perl(.*)/{s,perl(\(.*\)),perl-\1,;s,::,-,g}')
+ echo "$package"
+}
+
update_shell_title() {
[ -t 1 ] || return
local len=${COLUMNS:-80}
%__php_api_requires() %{nil}
%php_major_version ERROR
%php_api_version ERROR
+%requires_xorg_xserver_extension %{nil}
+%requires_xorg_xserver_xinput %{nil}
+%requires_xorg_xserver_font %{nil}
+%requires_xorg_xserver_videodrv %{nil}
%py_ver ERROR
%perl_vendorarch ERROR
%perl_vendorlib ERROR
fi
update_shell_title "cache_rpm_dump"
- local rpm_dump
- rpm_dump=`
- # what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
- dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
- case "$RPMBUILD" in
- rpm)
- ARGS='-bp'
- ;;
- rpmbuild)
- ARGS='--nodigest --nosignature --nobuild'
- ;;
- esac
- minirpm $ARGS --define "'prep $dump'" --nodeps $SPECFILE
- `
- if [ $? -gt 0 ]; then
- error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
- echo "$error" >&2
- Exit_error err_build_fail
- fi
+ if [ -x /usr/bin/rpm-specdump ]; then
+ rpm_dump_cache=`rpm-specdump $BCOND $TARGET_SWITCH $SPECFILE`
+ else
+ local rpm_dump
+ rpm_dump=`
+ # what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
+ dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
+ case "$RPMBUILD" in
+ rpm)
+ ARGS='-bp'
+ ;;
+ rpmbuild)
+ ARGS='--nodigest --nosignature --nobuild'
+ ;;
+ esac
+ minirpm $ARGS --define "'prep $dump'" --nodeps $SPECFILE
+ `
+ if [ $? -gt 0 ]; then
+ error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
+ echo "$error" >&2
+ Exit_error err_build_fail
+ fi
- # make small dump cache
- rpm_dump_cache=`echo "$rpm_dump" | awk '
- $2 ~ /^SOURCEURL/ {print}
- $2 ~ /^PATCHURL/ {print}
- $2 ~ /^nosource/ {print}
- $2 ~ /^PACKAGE_/ {print}
- '`
+ # make small dump cache
+ rpm_dump_cache=`echo "$rpm_dump" | awk '
+ $2 ~ /^SOURCEURL/ {print}
+ $2 ~ /^PATCHURL/ {print}
+ $2 ~ /^nosource/ {print}
+ $2 ~ /^PACKAGE_/ {print}
+ '`
+ fi
update_shell_title "cache_rpm_dump: OK!"
}
# icons are needed for successful spec parse
get_icons
- cd $SPECS_DIR
+ cd $SPEC_DIR
cache_rpm_dump
if [ "$NOSRCS" != "yes" ]; then
PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3; exit}')
if [ "$PACKAGE_NAME" != "$ASSUMED_NAME" ]; then
- echo "WARNING! Spec name ($ASSUMED_NAME) does not agree with package name ($PACKAGE_NAME)"
+ echo >&2 "WARNING! Spec name ($ASSUMED_NAME) does not agree with package name ($PACKAGE_NAME)"
fi
if [ -n "$BE_VERBOSE" ]; then
fi
if [ "$NOINIT" != "yes" ] ; then
- SOURCE_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_sourcedir}'`"
- SPECS_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_specdir}'`"
+ local extra
+ if [ "$ASSUMED_NAME" ]; then
+ extra="--define 'name $ASSUMED_NAME'"
+ fi
+ SOURCE_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_sourcedir}'`"
+ SPEC_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_specdir}'`"
else
SOURCE_DIR="."
- SPECS_DIR="."
+ SPEC_DIR="."
fi
__PWD="`pwd`"
set -v
fi
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
if [ ! -f "$SPECFILE" ]; then
SPECFILE="`basename $SPECFILE .spec`.spec"
fi
find_mirror()
{
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
local url="$1"
if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
cvs update mirrors >&2
# Warning: unpredictable results if same URL used twice
src_no ()
{
- cd $SPECS_DIR
+ cd $SPEC_DIR
rpm_dump | \
grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \
sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
[ "$NO5" = "yes" ] && return
no=$(src_no "$1")
[ -z "$no" ] && return
- cd $SPECS_DIR
+ cd $SPEC_DIR
local md5
if [ -f additional-md5sums ]; then
if [ -n "$source_md5" ]; then
echo $source_md5
else
- # we have empty SourceX-md5, but it is still possible
- # that we have NoSourceX-md5 AND NoSource: X
- nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'`
- if [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" ] ; then
- echo $nosource_md5
+ source_md5=`grep -i "BuildRequires:[ ]*digest(%SOURCE$no)[ ]*=" $SPECFILE | sed -e 's/.*=//'`
+ if [ -n "$source_md5" ]; then
+ echo $source_md5
+ else
+ # we have empty SourceX-md5, but it is still possible
+ # that we have NoSourceX-md5 AND NoSource: X
+ nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'`
+ if [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" ] ; then
+ echo $nosource_md5
+ fi
fi
fi
}
local srcno=$(src_no "$i")
if [ -n "$ADD5" ]; then
[ "$fp" = "$i" ] && continue # FIXME what is this check doing?
- grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE && continue
+ grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPEC_DIR/$SPECFILE && continue
+ grep -qiE '^BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $SPEC_DIR/$SPECFILE && continue
else
- grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE || continue
+ grep -qiE '^#[ ]*Source'$srcno'-md5[ ]*:' $SPEC_DIR/$SPECFILE || grep -qiE '^BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $SPEC_DIR/$SPECFILE || continue
fi
if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
need_files="$need_files $i"
for i in "$@"; do
local fp=$(nourl "$i")
local srcno=$(src_no "$i")
- local md5=$(grep -iE '^#[ ]*(No)?Source'$srcno'-md5[ ]*:' $SPECS_DIR/$SPECFILE )
+ local md5=$(grep -iE '^#[ ]*(No)?Source'$srcno'-md5[ ]*:' $SPEC_DIR/$SPECFILE )
+ if [ -z "$md5" ]; then
+ md5=$(grep -iE '^[ ]*BuildRequires:[ ]*digest[(]%SOURCE'$srcno'[)][ ]*=' $SPEC_DIR/$SPECFILE )
+ fi
if [ -n "$ADD5" ] && is_url $i || [ -n "$md5" ]; then
- local tag="Source$srcno-md5"
+ local tag="# Source$srcno-md5:\t"
if [[ "$md5" == *NoSource* ]]; then
- tag="NoSource$srcno-md5"
+ tag="# NoSource$srcno-md5:\t"
+ elif [ -n "$USEDIGEST" ]; then
+ tag="BuildRequires:\tdigest(%SOURCE$srcno) = "
fi
md5=$(md5sum "$fp" | cut -f1 -d' ')
- echo "Updating $tag ($md5: $fp)."
+ echo "Updating Source$srcno ($md5: $fp)."
perl -i -ne '
- print unless /^\s*#\s*(No)?Source'$srcno'-md5\s*:/i;
- print "# '$tag':\t'$md5'\n" if /^Source'$srcno'\s*:\s+/;
+ print unless (/^\s*#\s*(No)?Source'$srcno'-md5\s*:/i or /^\s*BuildRequires:\s*digest\(%SOURCE'$srcno'\)/i);
+ print "'"$tag$md5"'\n" if /^Source'$srcno'\s*:\s+/;
' \
- $SPECS_DIR/$SPECFILE
+ $SPEC_DIR/$SPECFILE
fi
done
}
fi
target="$fp"
- # prefer mirror over distfiles if there's mirror
+ # optionally prefer mirror over distfiles if there's mirror
# TODO: build url list and then try each url from the list
- if [ -z "$NOMIRRORS" ] && im=$(find_mirror "$i") && [ "$im" != "$i" ]; then
+ if [ -n "$PREFMIRRORS" ] && [ -z "$NOMIRRORS" ] && im=$(find_mirror "$i") && [ "$im" != "$i" ]; then
url="$im"
else
url=$(distfiles_url "$i")
# the md5 check must be moved elsewhere as if we've called from update_md5 the md5 is wrong.
if [ ! -f "$fp" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
- Exit_error err_no_source_in_repo $i
+ if [ -n "GREEDSRC" ]; then
+ get_greed_sources $i
+ else
+ Exit_error err_no_source_in_repo $i
+ fi
fi
# we check md5 here just only to refetch immediately
local fp=`nourl "$i"`
if [ -f "$fp" ]; then
tag_files="$tag_files $fp"
+ elif [ -n "GREEDSRC" ]; then
+ get_greed_sources $i
else
Exit_error err_no_source_in_repo $i
fi
if [ "$tag_files" ]; then
if [ "$TAG_VERSION" = "yes" ]; then
update_shell_title "tag sources: $TAGVER"
+ printf "Tagging %d files\n" $(echo $tag_files | wc -w)
cvs $OPTIONS $TAGVER $tag_files || exit
fi
if [ -n "$TAG" ]; then
update_shell_title "tag sources: $TAG"
- cvs $OPTIONS $TAG $tag_files || exit
+
+ while [ "$tag_files" ]; do
+ local chunk=$(echo $tag_files | tr ' ' '\n' | head -n 100)
+ printf "Tagging %d files\n" $(echo $chunk | wc -w)
+ cvs $OPTIONS $TAG $chunk || exit
+ tag_files=$(echo $tag_files | tr ' ' '\n' | tail +101)
+ done
fi
fi
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
if [ "$TAG_VERSION" = "yes" ]; then
update_shell_title "tag spec: $TAGVER"
cvs $OPTIONS $TAGVER $SPECFILE || exit
local fp=`nourl "$i"`
if [ -f "$fp" ]; then
tag_files="$tag_files $fp"
+ elif [ -n "GREEDSRC" ]; then
+ get_greed_sources $i
else
Exit_error err_no_source_in_repo $i
fi
cvs $OPTIONS $TAG $tag_files || exit
fi
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
cvs $OPTIONS $TAG $SPECFILE || exit
}
set -v
fi
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
if [ -n "$TRY_UPGRADE" ]; then
update_shell_title "build_package: try_upgrade"
unset TOLDVER TNEWVER TNOTIFY
fi
fi
- cd "$SPECS_DIR"
+ cd "$SPEC_DIR"
case "$COMMAND" in
build )
parent_spec_name=''
# Istnieje taki spec? ${package}.spec
- if [ -f "${SPECS_DIR}/${package}.spec" ]; then
+ if [ -f "${SPEC_DIR}/${package}.spec" ]; then
parent_spec_name=${package}.spec
- elif [ -f "${SPECS_DIR}/`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec" ]; then
+ elif [ -f "${SPEC_DIR}/`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec" ]; then
parent_spec_name="`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec"
else
- for provides_line in `grep ^Provides:.*$package ${SPECS_DIR} -R`
+ for provides_line in `grep ^Provides:.*$package ${SPEC_DIR} -R`
do
echo $provides_line
done
sub_builder_opts="${sub_builder_opts} -Upi"
fi
- cd "${SPECS_DIR}"
+ cd "${SPEC_DIR}"
./builder ${sub_builder_opts} "$@"
}
*)
echo You may want to manually remove following BuildRequires fetched:
echo $INSTALLED_PACKAGES
- echo Try poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`
+ echo "Try poldek -e \`cat $(pwd)/.${SPECFILE}_INSTALLED_PACKAGES\`"
;;
esac
fi
{
if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
update_shell_title "fetch build requires"
- if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
- # TODO: Conflicts list doesn't check versions
- local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
- local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+ if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ] || [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
+ if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
+ # TODO: Conflicts list doesn't check versions
+ local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+ local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+ fi
+ if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
+ local CNFL=$(rpm -q --specsrpm --conflicts $BCOND $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
+ local DEPS=$(rpm -q --specsrpm --requires $BCOND $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
+ fi
if [ -n "$CNFL" ] || [ -n "$DEPS" ]; then
- echo "fetch builderequires: install $DEPS; remove $CNFL"
- update_shell_title "poldek: install $DEPS; remove $CNFL"
+ echo "fetch builderequires: install [$DEPS]; remove [$CNFL]"
+ update_shell_title "poldek: install [$DEPS]; remove [$CNFL]"
$SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
fi
if [ -n "$CNFL" ]; then
echo "Trying to install dependencies ($DEPS):"
local log=.${SPECFILE}_poldek.log
$SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
- failed=$(awk -F: '/^error:/{print $2}' $log)
+ failed=$(awk '/^error:/{a=$2; sub(/^error: /, "", a); sub(/:$/, "", a); print a}' $log)
rm -f $log
local ok
if [ -n "$failed" ]; then
for package in $failed; do
- # FIXME: sanitise, deps could be not .spec files
- spawn_sub_builder -bb $package && ok="$ok $package"
+ spawn_sub_builder -bb $(depspecname $package) && ok="$ok $package"
done
DEPS="$ok"
else
mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
cd $TOP_DIR
- cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh}
+ cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh}
init_builder
echo "To checkout *all* .spec files:"
- echo "- remove $SPECS_DIR/CVS/Entries.Static"
- echo "- run cvs up in $SPECS_DIR dir"
+ echo "- remove $SPEC_DIR/CVS/Entries.Static"
+ echo "- run cvs up in $SPEC_DIR dir"
echo ""
echo "To commit with your developer account:"
- echo "- edit $SPECS_DIR/CVS/Root"
+ echo "- edit $SPEC_DIR/CVS/Root"
echo "- edit $SOURCE_DIR/CVS/Root"
}
+get_greed_sources() {
+ CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
+ if [ -n "BE_VERBOSE" ]; then
+ echo "Try greed download: $1 from: $CVSROOT"
+ fi
+ cvs -d $CVSROOT get SOURCES/$1
+ if [ $? != 0 ]; then
+ Exit_error err_no_source_in_repo $1
+ fi
+
+}
+
+# remove entries from CVS/Entries
+cvs_entry_remove() {
+ local cvsdir="$1"; shift
+ if [ ! -d "$cvsdir" ]; then
+ echo >&2 "cvs_entry_remove: $cvsdir is not a directory"
+ exit 1
+ fi
+
+ for file in "$@"; do
+ rm -f $cvsdir/CVS/Entries.new || return 1
+ awk -ve="${file##*/}" -F/ '$2 != e {print}' $cvsdir/CVS/Entries > $cvsdir/CVS/Entries.new || return 1
+ mv -f $cvsdir/CVS/Entries.new $cvsdir/CVS/Entries || return 1
+ done
+ return 0
+}
+
+mr_proper() {
+ init_builder
+ NOCVSSPEC="yes"
+ DONT_PRINT_REVISION="yes"
+ get_spec
+ parse_spec
+
+ # remove from CVS/Entries
+ cvs_entry_remove $SPEC_DIR $SPECFILE
+ cvs_entry_remove $SOURCE_DIR $SOURCES $PATCHES
+
+ # remove spec and sources
+ $RPMBUILD --clean --rmsource --rmspec --nodeps $SPECFILE
+}
+
#---------------------------------------------
# main()
NOSRCS="yes"
ALWAYS_CVSUP="no"
shift;;
+ -pm | --prefer-mirrors )
+ PREFMIRRORS="yes"
+ shift;;
--no-init )
NOINIT="yes"
shift;;
--init-rpm-dir)
COMMAND="init_rpm_dir"
shift ;;
+ --use-greed-sources )
+ GREEDSRC="1"
+ shift;;
-u | --try-upgrade )
TRY_UPGRADE="1"; shift ;;
-un | --try-upgrade-with-float-version )
RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
fi
;;
+ --alt_kernel)
+ shift
+ RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\""
+ shift
+ ;;
--short-circuit)
RPMBUILDOPTS="${RPMBUILDOPTS} --short-circuit"
shift
CVSTAG="${SPECFILE##*:}"
SPECFILE="${SPECFILE%%:*}"
fi
- ASSUMED_NAME="${SPECFILE%%.spec}"
+ ASSUMED_NAME="$(basename ${SPECFILE%%.spec})"
shift
esac
done
# ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt
if [ -n "$TEST_TAG" ]; then
- # - do not allow utf8 encoded specs on AC-branch
- if [ "$CVSTAG" = "AC-branch-disabled" ]; then
- local t
- t=$(grep '^Summary(.*\.UTF-8):' $SPECFILE)
- if [ "$t" ]; then
- Exit_error err_acl_deny "UTF-8 .specs not allowed on $CVSTAG"
- fi
- fi
-
local TAGVER=`make_tagver`
echo "Searching for tag $TAGVER..."
TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
fi
;;
"mr-proper" )
- $RPM --clean --rmsource --rmspec --force --nodeps $SPECFILE
+ mr_proper
;;
"list-sources-files" )
init_builder
projects / packages / rpm.git / blobdiff