[packages/rpm-build-tools] drop kdediff, kde3.5 unmaintained and current kde in git
glen
glen at pld-linux.org
Tue May 19 11:10:04 CEST 2015
commit f4caae9a3b3562ce5698996cd2d589ec78b997a1
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Feb 26 23:40:11 2015 +0200
drop kdediff, kde3.5 unmaintained and current kde in git
apply 2c615db0571679f0623998b44eb4ef437a6263b2 from rpm-build-macros repo
shrc.sh | 23 -----------------------
1 file changed, 23 deletions(-)
---
diff --git a/shrc.sh b/shrc.sh
index d4831ca..9013c81 100755
--- a/shrc.sh
+++ b/shrc.sh
@@ -196,29 +196,6 @@ 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\|Tylko\|Files\|Common\|Index:\|RCS file\|retrieving\)/d'"
-# 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() {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/0ee59b3ffd12cfe392d3b9797f8f241867262c66
More information about the pld-cvs-commit
mailing list