[packages/rpm-build-macros] drop rpm-build.sh, provided by ../rpm-build-tools/shrc.sh

glen glen at pld-linux.org
Fri Nov 13 20:57:37 CET 2015


commit 6f4eee82a3eb1f56f7c4b83fc6939cf29eef59ad
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Nov 13 21:53:31 2015 +0200

    drop rpm-build.sh, provided by ../rpm-build-tools/shrc.sh
    
    was removed in dec1a0aedb2fa4c662673def49b3a9d70d90a922
    but file still kept, which lead to duplicate life of same script in both
    repos. sigh...
    
    that commit makes up as rpm-build-macros 1.651

 rpm-build.sh | 237 -----------------------------------------------------------
 1 file changed, 237 deletions(-)
---
diff --git a/rpm-build.sh b/rpm-build.sh
deleted file mode 100755
index 61afde9..0000000
--- a/rpm-build.sh
+++ /dev/null
@@ -1,237 +0,0 @@
-# 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
-
-alias q='rpm -q --qf "%{N}-%|E?{%{E}:}|%{V}-%{R}.%{ARCH}\n"'
-
-# 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 at 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'"
-
-# 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{~,})
-}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/6f4eee82a3eb1f56f7c4b83fc6939cf29eef59ad



More information about the pld-cvs-commit mailing list