Commit 30ab5f8d authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbph: small fixes

parent c65ed784
...@@ -65,16 +65,19 @@ if [ "$PKGVENDOR" = "alt" ] ; then ...@@ -65,16 +65,19 @@ if [ "$PKGVENDOR" = "alt" ] ; then
%undefine __libtoolize" %undefine __libtoolize"
fi fi
else else
docmd $ETERBUILDBIN/rpmcs $SPECNAME docmd $ETERBUILDBIN/rpmcs --skip-reqs $SPECNAME
BUILDREQ="BuildRequires:" BUILDREQ="BuildRequires:"
if [ $(basename $SPECNAME) != "eepm.spec" ] ; then if [ $(basename $SPECNAME) != "eepm.spec" ] ; then
# Need our compat package and disable strong patch checking if ! grep -q "BuildRequires:.*rpm-build-altlinux-compat" $SPECNAME ; then
BUILDREQ="$BUILDREQ rpm-build-altlinux-compat >= 0.95" # Need our compat package and disable strong patch checking
BUILDREQ="$BUILDREQ rpm-build-altlinux-compat >= 0.95"
fi
fi fi
# hack against very straight patch command # hack against very straight patch command
FIXPATCHFUZZ="%define _default_patch_fuzz 3" FIXPATCHFUZZ="%define _default_patch_fuzz 3"
# see install in Korinf, need concatenate
BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ" BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ"
if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then
...@@ -255,9 +258,13 @@ if [ "$PKGVENDOR" != "alt" ] ; then ...@@ -255,9 +258,13 @@ if [ "$PKGVENDOR" != "alt" ] ; then
subst "s|^\(Source.*\)%release|\1$RELEASE|g" $SPECNAME subst "s|^\(Source.*\)%release|\1$RELEASE|g" $SPECNAME
subst "s|^\(Patch.*\)%release|\1$RELEASE|g" $SPECNAME subst "s|^\(Patch.*\)%release|\1$RELEASE|g" $SPECNAME
grep -q "%setup *-q" $SPECNAME || subst "s|^%setup |%setup -q |g" $SPECNAME if ! grep -q "%setup *-q" $SPECNAME ; then
subst "s|^%setup |%setup -q |g" $SPECNAME
subst "s|^%setup$|%setup -q|g" $SPECNAME
fi
# obsoletes since Slackware/13 (rpm 4.10) # obsoletes since Slackware/13 (rpm 4.10)
subst "s|^BuildPreReq:|BuildRequires:|g" $SPECNAME subst "s|^BuildPreReq:|BuildRequires:|g" $SPECNAME
subst "s|^PreReq:|Requires:|g" $SPECNAME
fi fi
# Auto*=yes,nomingw32 works only since ALT 4.1 # Auto*=yes,nomingw32 works only since ALT 4.1
...@@ -308,6 +315,8 @@ else ...@@ -308,6 +315,8 @@ else
DISTRARG="" DISTRARG=""
fi fi
test -s "$SPECNAME" || fatal "$SPECNAME is empty"
test -n "$TOCHANGELOG" && ENTRY=`echo -e "$ENTRY\n- $TOCHANGELOG"` test -n "$TOCHANGELOG" && ENTRY=`echo -e "$ENTRY\n- $TOCHANGELOG"`
add_changelog $SPECNAME -e "$ENTRY" add_changelog $SPECNAME -e "$ENTRY"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment