Merge branch 'master' of git.alt:packages/etersoft-build-utils

TODO

+      host-,   ?
+
+      ??
+
+     :
+fonts-ttf-%fname-1.04-alt1.src.rpm
+
 rpmbph:   --define _specdir --define _sourcedir
 rpmgp -r  git -
    %name -

bin/gpush

@@ -11,10 +11,25 @@ if [ "$1" = "-h" ] ; then
 	exit 1
 fi
 
-PROJECTNAME=$(basename `pwd`)
+# use as project name
+if [ -n "$1" ] ; then
+	PROJECTNAME=$1
+else
+	PROJECTNAME=$(basename `pwd`)
+fi
+
+CURRENTBRANCH=$(git branch | grep "^\*" | cut -d " " -f 2)
+
+if [ -z "$CURRENTBRANCH" ] ; then
+	echo "Can't detect current branch"
+	exit 1
+fi
+
+# more correctly
+CURRENTBRANCH=HEAD
 
-git push $@ git.alt:packages/$PROJECTNAME.git
-git push --tags git.alt:packages/$PROJECTNAME.git
+git push $@ git.alt:packages/$PROJECTNAME.git $CURRENTBRANCH:master
+git push --tags git.alt:packages/$PROJECTNAME.git $CURRENTBRANCH:master
 
 #> $ git commit -a; A='0.23-alt1'; git tag -s $A; \
-#>   git tag -s -f -m 'Sisyphus release $A' sisyphus $A
\ No newline at end of file
+#>   git tag -s -f -m 'Sisyphus release $A' sisyphus $A

bin/loginhsh

@@ -66,6 +66,10 @@ if [ ! -x "$HSH" ] ; then
 	exit 1
 fi
 
+# export OURAPTCONF with temp. file contains correct path to sources.list
+prepare_aptconfig
+
+HASHERARG="--apt-config=$OURAPTCONF --target $DEFAULTARCH"
 
 mygetopts $LISTARGS
 
@@ -78,13 +82,13 @@ fi
 
 if [ "$CLEANUP" = "1" ]; then
 	echog "Cleanup $HASHERDIR ..."
-	$HSH --cleanup-only $HASHERDIR || fatal "cleanup"
+	$HSH --cleanup-only $HASHERDIR $HASHERARG || fatal "cleanup"
 	exit 0
 fi
 
 if [ ! -d $HASHERDIR -o "$INITIALIZE" = "1" ]; then
 	echog "Initialize $HASHERDIR ..."
-	mkdir -p $HASHERDIR && $HSH --initroot-only $HASHERDIR || fatal "mkdir"
+	mkdir -p $HASHERDIR && $HSH $HASHERARG --initroot-only $HASHERDIR || fatal "mkdir"
 fi
 
 SHELLHASHERARG="--mountpoints=/proc"

bin/rpmbph

@@ -24,25 +24,30 @@ SPECNAME=$1
 
 BASERELEASE=$(get_numrelease $SPECNAME)
 
+FIXPATCHFUZZ="%define _default_patch_fuzz 3"
+
 # Set buildreq
 if [ "$VENDOR" = "alt" ] ; then
 	BUILDREQ="BuildRequires: rpm-build-compat >= 0.95"
-	[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=rpmbsh
+	[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=$ETERBUILDBIN/rpmbsh
 	# Change release according to alt policy with extensions
 	# General rule: alwars alt(N-1).MM.(N)
 	set_release $SPECNAME alt$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
 	ADDDEF=""
 	CLEANTEXT=""
+	# due new libtool
+	RECONFT="%undefine __libtoolize"
 else
-	BUILDREQ="BuildRequires: rpm-build-altlinux-compat >= 0.95"
-	[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=rpmbb
+	# Need our compat package and disable strong patch checking
+	BUILDREQ="BuildRequires: rpm-build-altlinux-compat >= 0.95\n$FIXPATCHFUZZ"
+	[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=$ETERBUILDBIN/rpmbb
 	set_release $SPECNAME eter$BASERELEASE$VENDOR
 	ADDDEF="%defattr(-, root, root)"
 	CLEANTEXT=""
 fi
 
 # Do not add BuildReq if already exist
-cat $SPECNAME | grep rpm-build-compat &>/dev/null && BUILDREQ=""
+cat $SPECNAME | grep rpm-build-compat &>/dev/null && BUILDREQ="$FIXPATCHFUZZ"
 
 # fix mktemp using for MCBC
 if [ "$VENDOR" = "mcbc" ] ; then
@@ -158,6 +163,14 @@ mv $SPECNAME $SPECNAME.old &&
 		sed -e "s|^Obsoletes: *\$||g" | \
 		cat > $SPECNAME
 
+# hack for build old eter packages
+if [ -n "$ETERREGNUM" ] ; then
+	subst "s|@ETERREGNUM@|$ETERREGNUM|g" $SPECNAME
+fi
+
+# Fedora 10 does mismatch for Patch: and %patch0
+subst "s|Patch:|Patch0:|g" $SPECNAME
+
 #TODO:
 #%if %{undefined buildroot}
 #BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -218,7 +231,7 @@ phelp()
 while getopts :hniv opt; do
     case $opt in
     h) phelp; exit 0;;
-    n) BUILDCOMMAND="rpmbs";;
+    n) BUILDCOMMAND="$ETERBUILDBIN/rpmbs";;
     v) VERBOSE=1;;
     +?) echog "$name: options should not be preceded by a '+'." 1>&2; exit 2;;
 #    ?)  echog "$name: $OPTARG: bad option.  Use -h for help." 1>&2 ; exit 2;;
@@ -255,7 +268,7 @@ fi
 
 unset MENV MENVARG
 
-# handle src.rpm too, LISTBUILT - result src.rpms in SRPMS dir
+# handle src.rpm too, LISTBUILT - result with full pathes to src.rpms
 pack_src_rpm $LISTNAMES
 
 export RPMTOPDIR=$RPMDIR/BP
@@ -265,11 +278,11 @@ export IGNOREGEAR=1
 # NOTE: we can do cd to some other dir...
 
 for i in $LISTBUILT ; do
-	SPKG=$RPMDIR/SRPMS/$i
-	uni_rpminstall $SPKG
-	SPECNAME=$RPMTOPDIR/SPECS/$(spec_by_srpm $SPKG)
-	test -r "$SPECNAME" || fatal "Spec $SPECNAME is not found"
-	rm -f $SPKG
+	uni_rpminstall $i
+	SPECNAME=$RPMTOPDIR/SPECS/$(spec_by_srpm $i)
+	test -f "$SPECNAME" || fatal "Spec $SPECNAME is not found"
+	# FIXME: do not remove if not repacked
+	#rm -f $SPKG
 	alt_tolocal $SPECNAME
 done
 

bin/rpmbs

@@ -141,7 +141,6 @@ set_incoming $MENV
 if [ -n "${DELETENOW}" ]; then
 	echog "Removing from '$RSYNCINCOMING/$INCOMING/'"
 	check_key
-	cd $RPMTOPDIR/SRPMS
 	for i in $LISTBUILT ; do
 		> $i
 	done
@@ -174,13 +173,10 @@ check_gear_and_tag()
 if [ -n "$SIGN" ]; then
 	release_check $LISTBUILT
 
-	cd $RPMTOPDIR/SRPMS
 	if [ -r "$LISTBUILT" ] ; then
 		echo if one spec, check gear
 		[ -n "$SPECDIR" ] || SPECDIR=`dirname $LISTNAMES`
-		cd - 
 		check_gear_and_tag $SPECDIR
-		cd $RPMTOPDIR/SRPMS
 	fi
 
 	echog "Will try to sign follow packages with GPG: \$LISTBUILT"
@@ -256,4 +252,11 @@ if [ -n "$SIGN" ]; then
 		sleep 10
 		exit 1
 	fi
+else
+	if [ -n "$ETERDESTSRPM" ] ; then
+		mkdir -p $ETERDESTSRPM || echog "Error mkdir $ETERDESTSRPM"
+		echog "Copying package(s) in \$ETERDESTSRPM"
+		cp -fv $LISTBUILT $ETERDESTSRPM || echog "Error during copying"
+	fi
+
 fi

bin/rpmgp

@@ -224,10 +224,8 @@ if [ -n "$INSTALLBINARY" ] ; then
 	parse_cmd_pre "$@"
 	pack_src_rpm $LISTRPMARGS
 	echog "Running apt-get for install needed packages for $LISTBUILT"
-	cd $RPMTOPDIR/SRPMS
 	# FIXME: ALT Specific
 	$SUDO apt-get build-dep $LISTBUILT
-	cd -
 	exit 0
 fi
 

etc/apt/sources.list.M40

@@ -2,8 +2,9 @@
 #
 # You can add [alt] after rpm for digital signature check
 
-rpm file:/var/ftp/ pub/ALTLinux/4.0/branch/i586 classic
-rpm file:/var/ftp/ pub/ALTLinux/4.0/branch/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/4.0/i586 classic
+rpm file:/var/ftp/ pub/ALTLinux/4.0/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/4.0/x86_32 classic
 
-rpm file:/var/ftp/ pub/ALTLinux/updates/4.0/i586 updates
-rpm file:/var/ftp/ pub/ALTLinux/backports/4.0/i586 backports
+#rpm file:/var/ftp/ pub/ALTLinux/updates/4.0/i586 updates
+#rpm file:/var/ftp/ pub/ALTLinux/backports/4.0/i586 backports

etc/apt/sources.list.M41

@@ -2,8 +2,9 @@
 #
 # You can add [alt] after rpm for digital signature check
 
-rpm file:/var/ftp/ pub/ALTLinux/4.1/branch/i586 classic
-rpm file:/var/ftp/ pub/ALTLinux/4.1/branch/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/4.1/i586 classic
+rpm file:/var/ftp/ pub/ALTLinux/4.1/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/4.1/x86_32 classic
 
-rpm file:/var/ftp/ pub/ALTLinux/updates/4.1/i586 updates
-rpm file:/var/ftp/ pub/ALTLinux/backports/4.1/i586 backports
+#rpm file:/var/ftp/ pub/ALTLinux/updates/4.1/i586 updates
+#rpm file:/var/ftp/ pub/ALTLinux/backports/4.1/i586 backports

etc/apt/sources.list.M50

@@ -2,8 +2,9 @@
 #
 # You can add [alt] after rpm for digital signature check
 
-rpm file:/var/ftp/ pub/ALTLinux/5.0/branch/i586 classic
-rpm file:/var/ftp/ pub/ALTLinux/5.0/branch/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/5.0/i586 classic
+rpm file:/var/ftp/ pub/ALTLinux/5.0/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/5.0/x86_32 classic
 
 #rpm file:/var/ftp/ pub/ALTLinux/updates/5.0/i586 updates
 #rpm file:/var/ftp/ pub/ALTLinux/backports/4.1/i586 backports

etersoft-build-utils.spec

 Name: etersoft-build-utils
 Version: 1.5.6
-Release: alt2
+Release: alt3
 
 Summary: A set of build rpm utilities
 
@@ -61,6 +61,9 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %config(noreplace) %_sysconfdir/eterbuild/repos
 
 %changelog
+* Fri Apr 24 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.6-alt3
+- rpmbph: small fixes
+
 * Wed Mar 04 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.6-alt2
 - small replacements fix for nx
 - fix build in empty RPM dir

share/eterbuild/functions/common

@@ -23,6 +23,7 @@ set_eterbuilddir()
 			ETERBUILDDIR=/usr/share/eterbuild
 		fi
 	fi
+	ETERBUILDBIN=$(readlink -f $ETERBUILDDIR/../../bin)
 	test -n "$ETERBUILDDIR"
 	# returns test result
 }
@@ -101,7 +102,7 @@ if [ "$VENDOR" = "alt" ] && [ -n "$MENV" ] ; then
 	MENVARG="-$MENV"
 else
 	# FIXME: echog breakes vars
-	echo "Distribution: \$DISTRNAME (\$VENDOR) (target package: \$TARGET)"
+	echog "Distribution: \$DISTRNAME (\$VENDOR) (target package: \$TARGET)"
 fi
 }
 

share/eterbuild/functions/hasher

@@ -39,7 +39,7 @@ print_tmp_sourceslist()
 	# Note: /etc/apt and /etc/eterbuild/apt is supported
 	SLIST=`cat "$1" | \
 		sed -e "s|\"/etc/.*apt/sources.list|\"$ETERBUILDETC/apt/sources.list|g" | \
-		grep "/sources.list" "$1" | sed -e 's|.*"\(.*\)".*|\1|g'`
+		grep "/sources.list" | sed -e 's|.*"\(.*\)".*|\1|g'`
 	#SLIST="$ETERBUILDETC/apt/`basename $SLIST`"
 	test -r "$SLIST" || fatal "'$SLIST' - sources.list path from $1 is missed"
 	cat "$SLIST" | \
@@ -48,8 +48,8 @@ print_tmp_sourceslist()
 
 prepare_aptconfig()
 {
-	print_tmp_aptconf $APTCONF >$OURTMPDIR/apt.conf.$MENV || fatal "Can't create apt.conf"
 	export OURAPTCONF=$OURTMPDIR/apt.conf.$MENV
-	print_tmp_sourceslist $APTCONF >$OURTMPDIR/sources.list.$MENV || fatal "Can't create sources.list"
+	print_tmp_aptconf $APTCONF >$OURAPTCONF || fatal "Can't create apt.conf"
 	export OURSOURCES=$OURTMPDIR/sources.list.$MENV
+	print_tmp_sourceslist $APTCONF >$OURSOURCES || fatal "Can't create sources.list"
 }

share/eterbuild/functions/rpm

@@ -142,6 +142,7 @@ build_rpms_name()
 }
 
 # LISTNAMES, options in arg
+# build LISTBUILT list with src.rpm full path
 pack_src_rpm()
 {
 local i
@@ -156,7 +157,13 @@ do
 	
 	if [ -z ${i/*rpm/} ] ; then
 		# if rpm not spec, guess it is src.rpm
-		NAMESRPMIN=$(basename $i)
+		#NAMESRPMIN=$(basename $i)
+
+		if [ -f "$i" ] ; then
+			LISTBUILT="$LISTBUILT $i"
+		else
+			fatal "pack_src_rpm: Can't find '$i'"
+		fi
 	else
 		#     
 		# BASENAME, RELEASE, VERSION, NAMESRPMIN, NAMERPMIN
@@ -175,14 +182,15 @@ do
 			echog "Just packing \$NAMESRPMIN"
 			uni_rpmbuild $i -bs $ARGS $NODEPS --target $DEFAULTARCH || fatal "Error with rpmbuild"
 		fi
+
+		# Check the package really built
+		if [ -f "$RPMTOPDIR/SRPMS/$NAMESRPMIN" ] ; then
+			LISTBUILT="$LISTBUILT $RPMTOPDIR/SRPMS/$NAMESRPMIN"
+		else
+			fatal "Can't find '$NAMESRPMIN' in '$RPMTOPDIR/SRPMS'"
+		fi
 	fi
-	
-	# Check the package really built
-	if [ -f $RPMTOPDIR/SRPMS/$NAMESRPMIN ] ; then
-		LISTBUILT="$LISTBUILT $NAMESRPMIN"
-	else
-		fatal "Can't find '$NAMESRPMIN' in '$RPMTOPDIR/SRPMS'"
-	fi
+
 done
 # remove extra space before list
 LISTBUILT=$(echo "$LISTBUILT" | sed -e "s|^ ||")

share/eterbuild/functions/spec

@@ -9,6 +9,7 @@ get_var()
 
 }
 
+# FIXME: only ALT handled rpm -bE
 #         
 eval_spec()
 {
@@ -64,7 +65,8 @@ set_release()
 inc_release()
 {
 	local BASERELEASE=$(get_numrelease "$1")
-	set_release "$1" $(get_txtrelease "$1")$(($BASERELEASE + 1 ))
+	local MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
+	set_release "$1" $(get_txtrelease "$1")$(($MAJOR + 1 ))
 }
 
 # inc 2.x to 2.(x+1) or 2 to 2.1
@@ -132,8 +134,8 @@ subst_namever()
 {
 	sed -e "s|%{name}|$BASENAME|g
 			s|%{version}|$VERSION|g
-			s|%name|$BASENAME/|g
-			s|%version|$VERSION/|g"
+			s|%name|$BASENAME|g
+			s|%version|$VERSION|g"
 }
 
 

share/eterbuild/pkgrepl/pkgrepl.centos.5

@@ -3,3 +3,4 @@ jackit-devel|
 
 # XOrg
 xorg-x11-devel|
+xorg-sdk|xorg-x11-server-sdk
\ No newline at end of file

share/eterbuild/pkgrepl/pkgrepl.lxp

@@ -3,3 +3,4 @@ gpm-devel|
 libungif-devel|
 perl-devel|perl
 libgtkmm2-devel|gtkmm24-devel
+xorg-sdk|xorg-x11-server-sdk
\ No newline at end of file

share/eterbuild/pkgrepl/pkgrepl.mdv

@@ -78,3 +78,4 @@ xorg-inputproto-devel|x11-proto-devel
 xorg-xextproto-devel|x11-proto-devel
 xorg-sdk|x11-server-devel
 
+libICE-devel|libice6-devel
\ No newline at end of file

share/eterbuild/pkgrepl/pkgrepl.mdv.2008.1

 libxslt-devel|libxslt1-devel
 libgtkmm2-devel|libgtkmm2.4-devel
+jackit-devel|libjack-devel

share/eterbuild/pkgrepl/pkgrepl.mdv.2009.0 → share/eterbuild/pkgrepl/pkgrepl.mdv.2009

 libxslt-devel|libxslt-devel
+jackit-devel|libjack-devel

share/eterbuild/pkgrepl/pkgrepl.suse

@@ -72,4 +72,7 @@ gccmakedep|xorg-x11-util-devel
 
 sysvinit-utils|sysvinit
 
-netcat|netcat
\ No newline at end of file
+netcat|netcat
+
+xorg-sdk|xorg-x11-server-sdk
+libICE-devel|xorg-x11-libICE-devel
\ No newline at end of file

tests/get_release.sh

@@ -51,12 +51,6 @@ check get_numrelease 3.1 `get_numrelease`
 TESTREL=alt4.2
 check get_txtrelease alt `get_txtrelease`
 
-TESTREL=alt5
-check inc_subrelease "alt5.1" `inc_subrelease ""`
-
-TESTREL=alt6.2
-check inc_subrelease "alt6.3" `inc_subrelease ""`
-
 BASERELEASE=27.5
 MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
 MINOR=`echo "$BASERELEASE" | sed -e "s|.*\.||"`

tests/get_version.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod spec
+
+SPEC=get_ver.spec
+
+check_get_version()
+{
+RES=$1
+cat <<EOF >$SPEC
+Name: get_version_test
+Release: alt1
+Summary: Test
+Group: Other
+License: Public License
+%define major 1.0
+%define ver 10
+%define maj 1.0
+Version: $TESTVER
+
+%description
+Get version test
+EOF
+RESGET=`get_version $SPEC`
+	[ "$RES" != "$RESGET" ] && echo "FATAL with 'get_version': result '$RES' do not match with '$RESGET'" || echo "OK for 'get_version' with '$RESGET'"
+}
+
+TESTVER=1.0.10
+check_get_version 1.0.10
+
+# spec evals only on ALT
+TESTVER=%major.10
+check_get_version 1.0.10
+
+TESTVER=%maj.%ver
+check_get_version 1.0.10
+
+rm -f $SPEC

tests/increment_release.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod spec
+
+check()
+{
+	[ "$2" != "$3" ] && echo "FATAL with '$1': result '$2' do not match with '$3'" || echo "OK for '$1' with '$2'"
+}
+
+
+get_release()
+{
+	#echo "Warning: Error test %test" >&2
+	echo $TESTREL
+}
+
+set_release()
+{
+	echo "$2"
+}
+
+
+
+TESTREL=alt5
+check inc_subrelease "alt5.1" `inc_subrelease ""`
+
+TESTREL=alt6.2
+check inc_subrelease "alt6.3" `inc_subrelease ""`
+
+
+TESTREL=alt5
+check inc_release "alt6" `inc_release ""`
+
+TESTREL=alt6.2
+check inc_release "alt7" `inc_release ""`
+

tests/test_aptconf.sh

@@ -10,7 +10,7 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "$(pwd)/sources.list.SS";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.SS";
 EOF
 
 cat <<EOF >sources.list.SS