- introduce php_minor_version version

[packages/rpm-build-macros.git] / rpm-build.sh

diff --git a/rpm-build.sh b/rpm-build.sh
index ab0cc1067e104e4db0f0583dc3c3240429d3ee11..924ee8107ca46668bb682ad45d438a29d4e734df 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -1,5 +1,4 @@
 # shell aliases and functions for PLD Developer
-# $Id$
 
 # set $dist, used by functions below
 [ -n "$dist" ] || dist=$(awk '/PLD Linux/ {print tolower($NF)}' /etc/pld-release 2>/dev/null | tr -d '()')
@@ -89,8 +88,16 @@ dist-verify() {
                ignore="$ignore kadu-theme-icons-crystal16 kadu-theme-icons-crystal22 kadu-theme-icons-nuvola16 kadu-theme-icons-nuvola22 kadu-module-iwait4u"
                # obsoleted
                ignore="$ignore php-pear-Net_Ping-tests"
+               # obsoleted
+               ignore="$ignore nmap-X11"
+               # mksd dependency not distributale
+               ignore="$ignore samba-vfs-vscan-mks"
+               # ibbackup is not distributale
+               ignore="$ignore innobackup"
+
                # renamed to vim-syntax-txt2tags
                ignore="$ignore txt2tags-vim"
+
                for a in $ignore; do
                        args="$args --ignore=$a"
                done
@@ -243,8 +250,7 @@ sed -e '
        s,^@@ ,\e[33m&,;
        s,^-,\e[35m&,;
        s,^+,\e[36m&,;
-       s,
-,\e[44m^M\e[49m,g;
+       s,\r,\e[44m^M\e[49m,g;
        s,      ,    ,g;
        s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\e[41m\2\e[49m,g;
        s,$,\e[0m,
@@ -276,3 +282,14 @@ d() {
 
        (builtin cd "$dir"; dif $diff{~,})
 }
+rpmb() {
+       local SPEC SPECDIR
+       for arg in "$@"; do
+               case "$arg" in
+                       *.spec) SPEC="$arg"
+                               ;;
+               esac
+       done
+       SPECDIR=$(dirname "$(pwd)/${SPEC:-.}")
+       command rpmbuild --define "_specdir $SPECDIR" --define "_sourcedir $SPECDIR" "$@"
+}