-i
Try to increment package release
-u
- cvs update first
+ git pull first
-t | -n
Test mode (dry-run). do not commit
-m
" $specfile
}
+# normalize spec
+# takes as input:
+# - PACKAGE/
+# - ./PACKAGE/
+# - PACKAGE
+# - PACKAGE.spec
+# - ./PACKAGE.spec
+# - PACKAGE/PACKAGE
+# - PACKAGE/PACKAGE.spec
+# - ./PACKAGE/PACKAGE.spec
+# - rpm/PACKAGE/PACKAGE
+# - rpm/PACKAGE/PACKAGE.spec
+# - ./rpm/PACKAGE/PACKAGE.spec
+# returns PACKAGE
+package_name() {
+ local specfile="${1%/}" package
+
+ # basename
+ specfile=${specfile##*/}
+ # strip .spec
+ package=${specfile%.spec}
+
+ echo $package
+}
+
if [ ! -x /usr/bin/getopt ]; then
echo >&1 "You need to install util-linux to use relup.sh"
exit 1
done
tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
-for spec in "$@"; do
- spec=${spec%.spec}.spec
+topdir=$(rpm -E '%{_topdir}')
+
+# round 1: get packages and update .spec files
+# batches changes for each release
+# TODO: drop this, in git need to commit and push each package separately, no
+# way to group changes as in CVS
+cd "$topdir"
+for pkg in "$@"; do
+ pkg=$(package_name "$pkg")
+ spec=$(rpm -D "name $pkg" -E '%{_specdir}/%{name}.spec')
+ spec=${spec#$topdir/}
+
if [ "$update" = "1" ]; then
- cvs up "$spec"
+ ./builder -g -ns "$spec"
fi
rel=$(get_release "$spec")
if [ "$inc" = 1 ]; then
echo "$spec" >> "$tmpd/$rel"
done
+# round 2: commit the changes
n="$(echo -e '\nn')"
n="${n%%n}"
-for file in $(ls "$tmpd" 2>/dev/null); do
- files=$(cat "$tmpd/$file")
- rel=$(basename "$file")
- msg=""
- [ -n "$message" ] && msg="$msg- $message$n"
- msg="$msg- release $rel$n"
- echo cvs ci -m "'$msg'"
- if [ "$test" != 1 ]; then
- cvs ci -m "$msg" $files
- fi
+for rel in $(ls "$tmpd" 2>/dev/null); do
+ packages=$(cat "$tmpd/$rel")
+ for pkg in $packages; do
+ pkgdir=${pkg%/*}
+ spec=${pkg##*/}
+ msg=""
+ [ -n "$message" ] && msg="$msg- $message$n"
+ msg="$msg- release ${rel%%%*} (by relup.sh)"
+ echo git commit -m "$msg" $spec
+ if [ "$test" != 1 ]; then
+ cd $pkgdir
+ git commit -m "$msg" $spec
+ git push
+ cd ..
+ fi
+ done
done
rm -rf $tmpd