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

Makefile

 
+pkgdatadir=$(datadir)/eterbuild
+
 all: QuickHelp.txt QuickHelp.koi8-r.txt
 	$(MAKE) -C po
 
@@ -10,16 +12,16 @@ QuickHelp.txt:
 
 install: 
 	$(MAKE) -C po install
-	mkdir -p $(bindir) $(sysconfdir)/eterbuild/apt $(sysconfdir)/rpm
-	mkdir -p $(datadir)/eterbuild/functions/
-	mkdir -p $(datadir)/eterbuild/pkgrepl $(datadir)/eterbuild/grprepl/
-	install -m 755 bin/* $(bindir)
-	install -m 644 etc/apt/* $(sysconfdir)/eterbuild/apt/
-	install -m 644 etc/rpm/* $(sysconfdir)/rpm/
-	install -m 644 etc/config $(sysconfdir)/eterbuild/
-	install -m 644 etc/repos $(sysconfdir)/eterbuild/
-	#install -m 644 apt/apt.conf.* apt/sources.list.* %buildroot/%_sysconfdir/apt/
-	install -m 644 share/eterbuild/pkgrepl/pkgrepl.* $(datadir)/eterbuild/pkgrepl/
-	install -m 644 share/eterbuild/grprepl/grprepl.* $(datadir)/eterbuild/grprepl/
-	install -m 644 share/eterbuild/eterbuild $(datadir)/eterbuild/
-	install -m 644 share/eterbuild/functions/* $(datadir)/eterbuild/functions/
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(sysconfdir)/eterbuild/apt $(DESTDIR)$(sysconfdir)/rpm
+	mkdir -p $(DESTDIR)$(pkgdatadir)/functions/
+	mkdir -p $(DESTDIR)$(pkgdatadir)/pkgrepl $(DESTDIR)$(pkgdatadir)/grprepl/
+	install -m 755 bin/* $(DESTDIR)$(bindir)
+	install -m 644 etc/apt/* $(DESTDIR)$(sysconfdir)/eterbuild/apt/
+	install -m 644 etc/rpm/* $(DESTDIR)$(sysconfdir)/rpm/
+	install -m 644 etc/config $(DESTDIR)$(sysconfdir)/eterbuild/
+	install -m 644 etc/repos $(DESTDIR)$(sysconfdir)/eterbuild/
+	install -m 644 share/eterbuild/pkgrepl/pkgrepl.* $(DESTDIR)$(pkgdatadir)/pkgrepl/
+	install -m 644 share/eterbuild/grprepl/grprepl.* $(DESTDIR)$(pkgdatadir)/grprepl/
+	install -m 644 share/eterbuild/eterbuild $(DESTDIR)$(pkgdatadir)/
+	install -m 644 share/eterbuild/functions/* $(DESTDIR)$(pkgdatadir)/functions/

NEWS

+etersoft-build-utils-1.5.5: 15 Jan 2009
+- rpmbph: support non numerical releases
+- loginhsh: enable /proc mount
+- rpmqf: value link recursively
+- rpmgs: add set version support (altbug #14397)
+- update repl rules
+- fix LISTBUILT, LISTNAMES, LISTRPMARGS (remove spaces)
+- add IGNOREGEAR support to disable gear detecting in current dir)
+
+etersoft-build-utils-1.5.4: 10 Jan 2009
+- introduce eterbuild/eterbuild script for public use
+- cleanup code, remove obsoleted functions
+- add support set version via rpmgs
+- fix build result detecting
+
 etersoft-build-utils-1.5.3: 04 Jan 2009
 - add IGNOREGEAR env var support
 - build_rpms_name: detect package arch from spec

bin/rpmbph

@@ -30,7 +30,7 @@ if [ "$VENDOR" = "alt" ] ; then
 	[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=rpmbsh
 	# Change release according to alt policy with extensions
 	# General rule: alwars alt(N-1).MM.(N)
-	set_release $SPECNAME alt$(($BASERELEASE - 1)).$MDISTR.$BASERELEASE
+	set_release $SPECNAME alt$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
 	ADDDEF=""
 	CLEANTEXT=""
 else

etersoft-build-utils.spec

 Name: etersoft-build-utils
-Version: 1.5.4
+Version: 1.5.5
 Release: alt1
 
 Summary: A set of build rpm utilities
@@ -42,6 +42,7 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %make
 
 %install
+# install to datadir and so on
 %makeinstall
 %find_lang %name
 
@@ -60,9 +61,19 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %config(noreplace) %_sysconfdir/eterbuild/repos
 
 %changelog
+* Thu Jan 15 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.5-alt1
+- rpmbph: support non numerical releases
+- loginhsh: enable /proc mount
+- rpmqf: value link recursively
+- rpmgs: add set version support (altbug #14397)
+- update repl rules
+- cleanup code
+
 * Tue Jan 06 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.4-alt1
 - introduce eterbuild/eterbuild script for public use
 - cleanup code, remove obsoleted functions
+- add support set version via rpmgs
+- fix build result detecting
 
 * Sun Jan 04 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.3-alt1
 - add IGNOREGEAR env var support

share/eterbuild/functions/common

@@ -57,6 +57,8 @@ print_list()
 is_gear()
 {
 	local DIR=$1
+	[ -z "$IGNOREGEAR" ] || return 1
+
 	[ -n "$DIR" ] && [ -d "$DIR/.gear" ] && return 0
 	[ -d ".gear" ] && return 0
 

share/eterbuild/functions/hasher

@@ -27,8 +27,7 @@ print_tmp_aptconf()
 	test -r "$1" || fatal "$1 is missed"
 	# Note: /etc/apt and /etc/eterbuild/apt is supported
 	cat "$1" | \
-		sed -e "s|\"/etc/.*/sources.list|\"$OURTMPDIR/sources.list|g"
-#		sed -e "s|\"/etc/.*apt/sources.list|\"$ETERBUILDETC/apt/sources.list|g"
+		sed -e "s|\".*/sources.list|\"$OURTMPDIR/sources.list|g"
 }
 
 # printout sources.list with filtering
@@ -39,13 +38,10 @@ print_tmp_sourceslist()
 	test -r "$1" || fatal "$1 is missed"
 	# Note: /etc/apt and /etc/eterbuild/apt is supported
 	SLIST=`cat "$1" | \
-		sed -e "s|\"/etc/.*/sources.list|\"$ETERBUILDETC/apt/sources.list|g" | \
-		grep "apt/sources.list" "$1" | sed -e 's|.*"\(.*\)".*|\1|g'`
-	#SLIST=`echo "$SLIST" | \
-	#	sed -e "s|/etc/.*/sources.list|\"$OURTMPDIR/sources.list|g"`
-	SLIST="$ETERBUILDETC/apt/`basename $SLIST`"
+		sed -e "s|\"/etc/.*apt/sources.list|\"$ETERBUILDETC/apt/sources.list|g" | \
+		grep "/sources.list" "$1" | sed -e 's|.*"\(.*\)".*|\1|g'`
+	#SLIST="$ETERBUILDETC/apt/`basename $SLIST`"
 	test -r "$SLIST" || fatal "'$SLIST' - sources.list path from $1 is missed"
-	[ -n "$VERBOSE" ] && cat "$SLIST"
 	cat "$SLIST" | \
 		sed -e "s|i586|$DEFAULTARCH|g"
 }

share/eterbuild/functions/rpm

@@ -156,7 +156,7 @@ test -z "$LISTBUILT" && fatal "Error: List for build is empty. Check if file is
 #LISTRPMARGS=`echo ${LISTRPMARGS} | sed -e "s/--nodeps//g"`
 }
 
-# build binary package list (1st - repo dir, 2st - pkgname
+# build binary package list (1st - repo dir, 2st - pkgname)
 get_binpkg_list()
 {
 	local PKGDIR=$1

share/eterbuild/functions/spec

@@ -120,6 +120,13 @@ set_version()
 	fi
 }
 
+# decrement release with workaround about non textual release
+decrement_release()
+{
+	local NUMPART=$(echo $1 | sed -e "s|[^0-9].*||g")
+	[ -n "$NUMPART" ] || NUMPART=1
+	echo $(($NUMPART - 1))
+}
 
 subst_namever()
 {

share/eterbuild/pkgrepl/pkgrepl.alt.4.0

 xorg-proto-devel|xorg-x11-proto-devel
+xorg-inputproto-devel|xorg-x11-proto-devel
+xorg-xextproto-devel|xorg-x11-proto-devel
 libslang2-devel|libslang-devel
-xorg-cf-files|
+libesd-devel|esound-devel
+sysvinit-utils|
+xorg-sdk|xorg-x11-devel

share/eterbuild/pkgrepl/pkgrepl.mdv

@@ -72,3 +72,9 @@ libGLU|libmesaglu1
 
 libexpat|libexpat1
 libexpat-devel|libexpat1-devel
+
+libesd-devel|libesound-devel
+xorg-inputproto-devel|x11-proto-devel
+xorg-xextproto-devel|x11-proto-devel
+xorg-sdk|x11-server-devel
+

share/eterbuild/pkgrepl/pkgrepl.rpm

@@ -84,3 +84,5 @@ libexpat|expat
 libexpat-devel|expat-devel
 
 libltdl-devel|libtool-ltdl-devel
+
+libhal-devel|hal-devel
\ No newline at end of file

share/eterbuild/pkgrepl/pkgrepl.suse

@@ -69,3 +69,9 @@ libmesa-devel|xorg-x11-Mesa-devel
 libGLU-devel|xorg-x11-Mesa-devel
 
 gccmakedep|xorg-x11-util-devel
+
+libesd-devel|esound-devel
+sysvinit-utils|sysvinit
+xorg-inputproto-devel|xorg-x11-proto-devel
+xorg-xextproto-devel|xorg-x11-proto-devel
+xorg-sdk|xorg-x11-server

tests/decrement_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'"
+}
+
+check_dec()
+{
+	check $1 `decrement_release $1` $2
+}
+
+check_dec 39 38
+check_dec 39.1 38
+check_dec 39cvs 38
+check_dec 39.1cvs 38
+check_dec cvs 0

tests/test_aptconf.sh

@@ -3,14 +3,26 @@
 . `dirname $0`/../share/eterbuild/functions/common
 load_mod hasher
 
-parse_cmd_pre ""
+# Create test apt.conf file
+cat <<EOF >apt.conf.SS
+// Test apt.conf
+Dir::Etc::main "/dev/null";
+Dir::Etc::parts "/var/empty";
+Dir::Etc::SourceParts "/var/empty";
+
+Dir::Etc::sourcelist "$(pwd)/sources.list.SS";
+EOF
 
+cat <<EOF >sources.list.SS
+# Test sources.list
+rpm file:/var/ftp/ pub/ALTLinux/Sisyphus/i586 classic
+rpm file:/var/ftp/ pub/ALTLinux/Sisyphus/noarch classic
+EOF
 
-print_tmp_aptconf $APTCONF
-echo "-------------------------------"
-#print_tmp_aptconf /etc/apt/apt.conf.SS
+export APTCONFBASE=$(pwd)/apt.conf
+
+parse_cmd_pre ""
 
-print_tmp_sourceslist $APTCONF
 
 prepare_aptconfig