From: Marcin Krol Date: Thu, 25 Oct 2012 19:46:51 +0000 (+0000) Subject: - merged changes from PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=5a9b18be6eab2b610becdb19920b91a4f368d394;p=packages%2Frpm-build-tools.git - merged changes from PLD - TODO: tldize shrc.sh if you are using it :) --- diff --git a/rpm-build-tools.spec b/rpm-build-tools.spec index 868fad3..3a58603 100644 --- a/rpm-build-tools.spec +++ b/rpm-build-tools.spec @@ -6,7 +6,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Name: rpm-build-tools Version: 4.5 -Release: 1 +Release: 2 License: GPL Group: Applications/File Group: Base @@ -14,6 +14,7 @@ Source0: builder.sh Source1: adapter.awk Source2: adapter.sh Source3: pldnotify.awk +Source4: shrc.sh BuildRequires: sed >= 4.0 Requires: gawk >= 3.1.7 Requires: grep @@ -24,10 +25,11 @@ Requires: rpmbuild(macros) >= 1.539 Requires: sed >= 4.0 Requires: util-linux Requires: wget -Suggests: cvs-client +Suggests: git-core >= 1.7 Suggests: rpm-specdump >= 0.3 Suggests: schedtool Suggests: vim-syntax-spec +Conflicts: git-core < 1.7 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -67,11 +69,12 @@ cp -p %{SOURCE3} pldnotify.awk %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/etc/shrc.d} cp -p adapter.awk $RPM_BUILD_ROOT%{_libdir}/adapter.awk install -p pldnotify.awk $RPM_BUILD_ROOT%{_bindir} install -p builder.sh $RPM_BUILD_ROOT%{_bindir}/builder install -p adapter.sh $RPM_BUILD_ROOT%{_bindir}/adapter +install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh %clean rm -rf $RPM_BUILD_ROOT @@ -81,4 +84,5 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/builder %attr(755,root,root) %{_bindir}/adapter %attr(755,root,root) %{_bindir}/pldnotify.awk +/etc/shrc.d/rpm-build.sh %{_libdir}/adapter.awk diff --git a/shrc.sh b/shrc.sh new file mode 100755 index 0000000..1c39f00 --- /dev/null +++ b/shrc.sh @@ -0,0 +1,327 @@ +# shell aliases and functions for PLD Developer + +# set $dist, used by functions below +[ -n "$dist" ] || dist=$(awk '/PLD Linux/ {print tolower($NF)}' /etc/pld-release 2>/dev/null | tr -d '()') + +case "$dist" in +ac|th|ti) + ;; +*) + # invalid one ;) + dist= +esac + +if [ "$dist" ]; then + +alias ipoldek-$dist="poldek -q --sn $dist --cmd" +alias $dist-provides="ipoldek-$dist what-provides" +alias $dist-verify=dist-verify +alias $dist-requires=dist-requires + +# move AC-branch tag to current checkout +# if AC-branch as branch exists, it is first removed +ac-tag() { + # see if remote has branch present + local branch=AC-branch + if git show-ref -q refs/remotes/origin/$branch; then + git fetch --tags + if [ -z "$(git tag --points-at origin/$branch 2>/dev/null)" ]; then + echo >&2 "There's no tag pointing to current $branch; refusing to delete branch" + return 1 + fi + # delete local branch if exists + git show-ref -q refs/heads/$branch && git branch -d $branch + + # drop remote branch + git push --delete origin $branch + fi + + git tag -f $branch + git push origin $branch +} + +# undo spec utf8 +# note: it will do it blindly, so any lang other than -pl is most likely broken +specutfundo() { + local spec="$1" + iconv -futf8 -tlatin2 "$spec" > m + sed -e 's/\.UTF-8//' m > "$spec" + rm -f m +} + +dist-requires() { + local opts deps + while [ $# -gt 0 ]; do + case "$1" in + --sn) + opts="$opts $1 $2" + shift + ;; + -*) + opts="$opts $1" + ;; + *) + deps="$deps $1" + ;; + esac + shift + done + + case "$dist" in + ac) + opts="$opts --sn=$dist-updates" + ;; + esac + + poldek -q -Q --sn $dist $opts --cmd what-requires $deps +} + +dist-verify() { + local args sn + sn="--sn $dist" + + case "$dist" in + ac) + sn="$sn --sn $dist-updates" + + local a ignore + # typo + ignore="$ignore kdenetwork-kopete-tool-conectionstatus" + # obsoleted + ignore="$ignore gimp-plugin-swfdec wine-drv-arts ntp-ntptrace" + # quake2@MAIN is now quake2forge, original quake2 restored to quake2 + ignore="$ignore quake2-3dfx quake2-sdl quake2-sgl quake2-snd-alsa quake2-snd-ao quake2-snd-oss quake2-snd-sdl quake2-static" + # obsoleted + ignore="$ignore mozilla-firefox-lang-en apache1-mod_perl-devel libyasm-static" + # renamed (courier-authlib.spec, r1.54) + ignore="$ignore courier-authlib-userdb courier-authlib-pipe" + # obsoleted, squid 2.6 + ignore="$ignore squid-winbind_acl squid-winbind_auth" + # obsoleted with 1.0.4 + ignore="$ignore python-numpy-FFT python-numpy-MA python-numpy-RNG" + # subpkgs renamed + ignore="$ignore apache1-doc apache1-index" + # obsoleted by kadu-module-mediaplayer-amarok + ignore="$ignore kadu-module-amarok" + # obsoleted by kadu-module-mediaplayer-xmms + ignore="$ignore kadu-module-xmms" + # obsoleted by kadu 0.6.0 + ignore="$ignore kadu-theme-icons-crystal16 kadu-theme-icons-crystal22 kadu-theme-icons-nuvola16 kadu-theme-icons-nuvola22 kadu-module-iwait4u" + # obsoleted pear test packages + ignore="$ignore php-*-tests" + # obsoleted + ignore="$ignore nmap-X11" + # mksd dependency not distributale + ignore="$ignore samba-vfs-vscan-mks" + # ibbackup is not distributale + ignore="$ignore innobackup" + # use ac-updates + ignore="$ignore ntp-client ntp" + # php4 only(php-pecl-tidy), for php<5.2(php-pecl-filter) + ignore="$ignore php-pecl-tidy php-pecl-filter" + + # renamed to vim-syntax-txt2tags + ignore="$ignore txt2tags-vim" + + for a in $ignore; do + args="$args --ignore=$a" + done + ;; + esac + + poldek $sn --up --upa -q "$@" + poldek $sn --uniq --noignore --verify=deps $args "$@" +} + +# displays latest used tag for a specfile +autotag() { + local out s + for s in "$@"; do + # strip branches + s=${s%:*} + # ensure package ends with .spec + s=${s%.spec}.spec + git fetch --tags + out=$(git for-each-ref --count=1 --sort=-authordate refs/tags/auto/$dist \ + --format='%(refname:short)') + echo "$s:$out" + done +} + +get-buildlog() { + local p=$1 + if [ -z "$p" ]; then + echo >&2 "Usage: get-buildlog PACKAGE" + echo >&2 "" + echo >&2 "Grabs buildlogs from pld builder for all arch." + return + fi + + local archlist + case "$dist" in + ac) + archlist='i686 i586 i386 athlon alpha sparc amd64 ppc' + ;; + th) + archlist='x86_64 i486 i686' + ;; + *) + echo >&2 "get-buildlog: $dist buildlogs are /dev/null" + return + esac + + local url arch path ftp=ftp://buildlogs.pld-linux.org + for arch in $archlist; do + [ "$arch" ] || continue + path=${url#$ftp} + echo -n "Checking $p.$arch... " + url=$(lftp -c "debug 0;open $ftp; cls --sort=date -r /$dist/$arch/OK/$p,*.bz2 /$dist/$arch/FAIL/$p,*.bz2 | tail -n1") + url=$ftp$url + + echo -n "$url... " + if wget -q $url -O .$p~; then + echo "OK" + mv -f .$p~ $p.$arch.bz2 + else + echo "SKIP" + rm -f .$p~ + fi + done +} + +fi # no $dist set + +alias adif="dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs -x autom4te.cache" +alias pclean="sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Files\|Common\|Index:\|RCS file\|retrieving\)/d'" + +# makes diff from PLD CVS urls +# requires: cvs, tee +urldiff() { + local url="$1" + if [ -z "$url" ]; then + echo >&2 "Reading STDIN" + read url + fi + + echo >&2 "Process $url" + local file="$url" + file=${file#*SPECS/} + file=${file#*SOURCES/} + file=${file##*/} + local r1=${file#*r1=} + local r2=${r1#*r2=} + r2=${r2%%[&;]*} + r1=${r1%%[&;]*} + file=${file%\?*} + file=${file%.diff} + + echo >&2 "$file: $r1 -> $r2" + + if [ -t 1 ]; then + cvs diff -u -r$r1 -r$r2 $file | tee m.patch | diffcol + else + cvs diff -u -r$r1 -r$r2 $file + fi +} + +# makes diff from kde svn path +# requires: wget, tee +kdediff() { + local url="$1" r1 r2 + # --- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc #624744:624745 + url=${url#*--- } + echo >&2 "Process $url" + r1=${url#*#} + r2=${r1#*:} + r1=${r1%:*} + + # http://websvn.kde.org/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc?rev=624745&r1=612579&r2=624745&makepatch=1&diff_format=u + # http://websvn.kde.org/branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp?r1=609808&r2=673027&view=patch + url=http://websvn.kde.org/${url% *} + url="$url?r1=$r1&r2=$r2&view=patch" + + if [ -t 1 ]; then + wget "$url" -O -| tee m.patch | diffcol + else + wget "$url" -O - + fi +} + +# merges two patches +# requires: patchutils +pmerge() { + combinediff -p1 $1 $2 > m.patch || return + pclean m.patch + dif $1 m.patch +} + +# downloads sourceforge url from specific mirror +sfget() { + local url="$1" + url="${url%?download}" + url="${url%?use_mirror=*}" + url="${url#http://downloads.}" + url="http://dl.${url#http://prdownloads.}" + # use mirror + local mirror="http://nchc.dl.sourceforge.net" + url="$mirror/sourceforge/${url#http://dl.sourceforge.net/}" + wget -c "$url" +} + +dif() { + if [ -t 1 ]; then + diff -ur -x .svn -x .git -x .bzr -x CVS "$@" | diffcol | less -R + else + diff -ur -x .svn -x .git -x .bzr -x CVS "$@" + fi +} + +diffcol() { +sed -e ' + s,,^[,g; + s,,^G,g; + s,^\(Index:\|diff\|---\|+++\) .*$,&,; + s,^@@ ,&,; + s,^-,&,; + s,^+,&,; + s,\r,^M,g; + s, , ,g; + s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\2,g; + s,$,, +' ${1:+"$@"} +} + +# does diff between FILE~ and FILE +# the diff can be applied with patch -p1 +d() { + local file="$1" + local dir diff + if [[ "$file" = /* ]]; then + # full path -- no idea where to strip + dir=. + diff=$file + else + # relative path -- keep one path component from current dir + dir=.. + diff=${PWD##*/}/${file} + fi + + (builtin cd "$dir"; dif $diff{~,}) +} + +# spec name from NVR +rpm2spec() { + sed -re 's,^(.+)-[^-]+-[^-]+$,\1.spec,' +} + +rpmb() { + local SPEC SPECDIR arg + for arg in "$@"; do + case "$arg" in + *.spec) SPEC="$arg" + ;; + esac + done + SPECDIR=$(dirname "$(pwd)/${SPEC:-.}") + command rpmbuild --define "_specdir $SPECDIR" --define "_sourcedir $SPECDIR" "$@" +}