fix paths, prepare to correct build

etersoft-build-utils/QuickHelp.koi8-r.txt

+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+loginhsh - install package in hasher / take shell
+Usage:  [-t -i -h -r] bin.rpm...
+:
+ -i -  hasher (  )
+ -c - cleanup hasher
+ -t -   hasher,   
+ -r -   hasher  ̣ 
+
+
+---------------------------
+Warning: Can't get topdir from Makefile.in
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+myhsh - build package via hasher
+Usage:  [-m -s -u -i -c] spec...
+:
+ -m -     
+ -s -  ()
+ -u -  ()    
+ -i - install built packages in test hasher
+ -c - build without stuff (previous built packages)
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbb - build  binary rpm from spec (with ccache using if found)
+Usage:  [-c -p -i -r] spec...
+:
+ -c - start from compile stage
+ -i -    
+ -p - packaging installed files into package
+ -r -    (buildreq)
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbph - backports spec and rebuild it
+Usage:  [-r -u -U -n -i -m -v] spec...
+:
+-r - ̣ 
+ -u/-U - sign and upload after build
+ -n -    hasher
+ -i - install built packages in test hasher
+ -v - more verbose
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbs - make src.rpm from spec
+Usage:  [-s -u -c -n --nodeps] spec...
+:
+ -s -  ()       
+ -c -   ()    
+ -u - sign package(s) and upload it to Incoming (backports)
+ -U - sign package(s) and upload it to Incoming (updates)
+ -d - remove package(s) from SRPMS and Incoming
+ -n - do not check with sisyphus_check before upload
+ -o - create nosrc.rpm package
+ -z - create src.rpm with compatible gzip compression
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbsh - BSH - build source; use hasher
+Usage:  [-r -s -u -m -i -c] spec...
+:
+-r - ̣ 
+ -m - sent result via email
+ -u/-U - sign and upload after build
+ -u -  ()      
+ -i - install built packages in test hasher
+ -c - build without stuff (previous built packages)
+
+
+---------------------------
+rpmbugs [-t] spec | bug number | package name | -qf command | /path/to/file - open bugs in BROWSER
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmcs spec - cleanup spec (like cleanup_spec command), adapted to ALT
+
+
+---------------------------
+Using:
+rpmgp [-a -c -n] [system] pkgname - download src.rpm from 'system' repository to RPM/SRPMS and install it
+ name -     src.rpm
+ system - name of system (ALT Linux by default if -a missed too)
+ -a  check for pkgname in all known repositories
+ -c  check for exist the package in ALT Linux repository
+ -b  install packages needed for build (installs with sudo apt-get)
+ -l  lists packages needed for build (in local pkg system notation) (experimental)
+ -n  do not install in RPM after download, download in current dir
+ -r  refresh package list (download it again)
+ -s  lists all known systems
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmgs - get sources for spec
+Usage:  [-a -r ] spec...
+:
+ -a -    (   (0))
+ -f -     
+
+
+---------------------------
+rpmqf - the same as rpm -qf
+
+
+---------------------------
+rpmrb spec [vermajor][.verminor] [rel] - update spec to vermajor.verminor version, build %rel release
+
+
+---------------------------
+rpmU - the same as [sudo] rpm -Uvh - update package
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmunmets - tests unmets in build packages
+Usage:  [-M24 -M40]
+:
+ -s   - get all unmets
+ -M40 - test for distro ALT Linux 4.0
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmurl - open package Url in browser
+Usage:  [-c -f -p -s] spec or package...
+:
+ -c -   URL
+ -f - print failed URL only
+ -p - open package page at sisyphus.ru
+ -s -     ,     

etersoft-build-utils/QuickHelp.txt

+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+loginhsh - install package in hasher / take shell
+Usage:  [-t -i -h -r] bin.rpm...
+Options:
+ -i - initialize hasher
+ -c - cleanup hasher
+ -t - use test hasher dir
+ -r - remote login to hasher
+
+
+---------------------------
+Warning: Can't get topdir from Makefile.in
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+myhsh - build package via hasher
+Usage:  [-m -s -u -i -c] spec...
+Options:
+ -m - mail result log
+ -s - sign package(s)
+ -u - sign and upload package(s) to Incoming
+ -i - install built packages in test hasher
+ -c - build without stuff (previous built packages)
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbb - build  binary rpm from spec (with ccache using if found)
+Usage:  [-c -p -i -r] spec...
+Options:
+ -c - start from compile stage
+ -i - install and package
+ -p - packaging installed files into package
+ -r - find build requires
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbph - backports spec and rebuild it
+Usage:  [-r -u -U -n -i -m -v] spec...
+Options:
+ -r - remote build
+ -u/-U - sign and upload after build
+ -n - do not build in hasher
+ -i - install built packages in test hasher
+ -v - more verbose
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbs - make src.rpm from spec
+Usage:  [-s -u -c -n --nodeps] spec...
+Options:
+ -s - sign package(s) and move it to upload dir
+ -c - only sign package(s) with checking
+ -u - sign package(s) and upload it to Incoming (backports)
+ -U - sign package(s) and upload it to Incoming (updates)
+ -d - remove package(s) from SRPMS and Incoming
+ -n - do not check with sisyphus_check before upload
+ -o - create nosrc.rpm package
+ -z - create src.rpm with compatible gzip compression
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmbsh - BSH - build source; use hasher
+Usage:  [-r -s -u -m -i -c] spec...
+Options:
+ -r - remote build
+ -m - sent result via email
+ -u/-U - sign and upload after build
+ -s - sign and and copy to upload after build
+ -i - install built packages in test hasher
+ -c - build without stuff (previous built packages)
+
+
+---------------------------
+rpmbugs [-t] spec | bug number | package name | -qf command | /path/to/file - open bugs in BROWSER
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmcs spec - cleanup spec (like cleanup_spec command), adapted to ALT
+
+
+---------------------------
+Using:
+rpmgp [-a -c -n] [system] pkgname - download src.rpm from 'system' repository to RPM/SRPMS and install it
+ name - installed package name or src.rpm
+ system - name of system (ALT Linux by default if -a missed too)
+ -a  check for pkgname in all known repositories
+ -c  check for exist the package in ALT Linux repository
+ -b  install packages needed for build (installs with sudo apt-get)
+ -l  lists packages needed for build (in local pkg system notation) (experimental)
+ -n  do not install in RPM after download, download in current dir
+ -r  refresh package list (download it again)
+ -s  lists all known systems
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmgs - get sources for spec
+Usage:  [-a -r ] spec...
+Options:
+ -a - get all source (not only 0)
+ -f - force download (remove source before download)
+
+
+---------------------------
+rpmqf - the same as rpm -qf
+
+
+---------------------------
+rpmrb spec [vermajor][.verminor] [rel] - update spec to vermajor.verminor version, build %rel release
+
+
+---------------------------
+rpmU - the same as [sudo] rpm -Uvh - update package
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmunmets - tests unmets in build packages
+Usage:  [-M24 -M40]
+Options:
+ -s   - get all unmets
+ -M40 - test for distro ALT Linux 4.0
+
+
+---------------------------
+Target ALT Linux system: SS, use /etc/apt/apt.conf.SS
+rpmurl - open package Url in browser
+Usage:  [-c -f -p -s] spec or package...
+Options:
+ -c - check URL
+ -f - print failed URL only
+ -p - open package page at sisyphus.ru
+ -s - open source dir in browser

etersoft-build-utils/bin/loginhsh

@@ -10,7 +10,7 @@
 # Public domain
 # TODO: -r
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 SAVEOPT=$@
 

etersoft-build-utils/bin/mkpatch

@@ -5,7 +5,7 @@
 # Make patch for file in $1 against CVS/SVN repository or .orig file
 #
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 if [ -f Makefile.in ] ; then
 	DD1=`grep ^TOPOBJDIR Makefile.in | sed -e "s| ||g"`

etersoft-build-utils/bin/myhsh

@@ -10,12 +10,7 @@
 #      ( -m)
 # -i    hasher  
 
-if [ ! -f /etc/rpm/etersoft-build-functions ] ; then
-	echog "NOTE: /etc/rpm/etersoft-build-functions does not exist"
-	echog "Please fix this path in $0 file if you are using local install"
-	exit 1
-fi
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 
 #############################

etersoft-build-utils/bin/rpmU

@@ -3,7 +3,7 @@
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 if [ "$1" = "-h" ]; then
 	echo "rpmU - the same as [sudo] rpm -Uvh - update package"

etersoft-build-utils/bin/rpmbb

@@ -11,7 +11,7 @@
 # TODO -M?
 # TODO: -c
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 # Start as helper
 if [ "$1" = "--helper" ]; then

etersoft-build-utils/bin/rpmbph

@@ -10,7 +10,7 @@
 #    alt0.M24.4
 # TODO: use RPMBUILDARG
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 #VENDORVERSION=`distr_vendor -e`
 DISTRVERSION=`distr_vendor -v`

etersoft-build-utils/bin/rpmbs

@@ -18,7 +18,7 @@
 #   -n,    
 # TODO: -r
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 SIGN=
 UPLOADNOW=
@@ -217,9 +217,9 @@ if [ -n "$SIGN" ]; then
 			#build_buildroot
 			echo -n "    $BUILDROOT "
 			if [ -d "$BUILDROOT" ] ; then
-				rm -rf "$BUILDROOT" && echo $"DONE" || echo $"failed"
+				rm -rf "$BUILDROOT" && echog "DONE" || echog "failed"
 			else
-				echo $"missed"
+				echog "missed"
 			fi
 		done
 

etersoft-build-utils/bin/rpmbsh

@@ -13,7 +13,7 @@
 # TODO:   
 # TODO:    ??
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 RESULT=0
 REMCOM=

etersoft-build-utils/bin/rpmbugs

@@ -8,7 +8,8 @@
 # rpmbugs  - |   | -qf   ,    
 # TODO:    (  ?)
 # TODO:   
-. /etc/rpm/etersoft-build-functions
+
+. /usr/share/eterbuild/common
 
 [ -n "$BROWSER" ] || BROWSER=url_handler.sh
 

etersoft-build-utils/bin/rpmcs

@@ -6,7 +6,8 @@
 # CS -- cleanup spec (like cleanup_spec command)
 # :
 # -  -
-. /etc/rpm/etersoft-build-functions
+
+. /usr/share/eterbuild/common
 
 dummy_spec()
 {

etersoft-build-utils/bin/rpmgp

@@ -9,7 +9,7 @@
 # -c - checkonline
 # -n - do not install
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 # path to ALT Linux's repositories
 REPOSITORY="files/SRPMS obsolete orphaned"

etersoft-build-utils/bin/rpmgs

@@ -12,7 +12,7 @@
 # -a - get all source
 # check for the same file with other compression
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 WEXT=""
 GETSOURCE=""

etersoft-build-utils/bin/rpmrb

@@ -23,7 +23,7 @@ if [ "$1" = "-h" ]; then
 	exit 0
 fi
 
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 test -e "$SPEC" || fatal "use with spec"
 

etersoft-build-utils/bin/rpmunmets

@@ -9,13 +9,7 @@
 #
 # Tests unmets in built int hasher packages
 
-if [ ! -f /etc/rpm/etersoft-build-functions ] ; then
-	echog "NOTE: /etc/rpm/etersoft-build-functions does not exist"
-	echog "Please fix this path in $0 file if you are using local install"
-	exit 1
-fi
-
-. /etc/rpm/etersoft-build-functions
+. /usr/share/eterbuild/common
 
 make_ordinalbox()
 {

etersoft-build-utils/bin/rpmurl

@@ -7,7 +7,8 @@
 # :
 # -  -
 #
-. /etc/rpm/etersoft-build-functions
+
+. /usr/share/eterbuild/common
 
 [ -n "$BROWSER" ] || BROWSER=url_handler.sh
 # (command from perl-libwww)

etersoft-build-utils/etc/apt/apt.conf.DD

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/apt/sources.list.DD";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.DD";

etersoft-build-utils/etc/apt/apt.conf.M23

@@ -6,6 +6,6 @@
 Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
-Dir::Etc::SourceList "/etc/apt/sources.list.M23";
+Dir::Etc::SourceList "/etc/eterbuild/apt/sources.list.M23";
  
 

etersoft-build-utils/etc/apt/apt.conf.M24

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/apt/sources.list.M24";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M24";

etersoft-build-utils/etc/apt/apt.conf.M30

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/apt/sources.list.M30";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M30";

etersoft-build-utils/etc/apt/apt.conf.M40

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/apt/sources.list.M40";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M40";

etersoft-build-utils/etc/apt/apt.conf.M41

+/*
+ * This is the main configuration file for the APT suite of tools,
+ * see apt.conf(5) for details.
+ */
+
+Dir::Etc::main "/dev/null";
+Dir::Etc::parts "/var/empty";
+Dir::Etc::SourceParts "/var/empty";
+
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M41";

etersoft-build-utils/etc/apt/apt.conf.SS

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/apt/sources.list.SS";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.SS";

etersoft-build-utils/etc/apt/sources.list.M41

+# Package repository URLs
+#
+# 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/updates/4.1/i586 updates
+rpm file:/var/ftp/ pub/ALTLinux/backports/4.1/i586 backports

etersoft-build-utils/etc/config

@@ -4,7 +4,7 @@
 # 20.06.04, 15.01.05, 28.02.05, 07.03.05, 07.09.05, 09.04.06
 # 
 # Config file for etersoft-build-utils
-# You can copy this file as ~/.ebconfig for per user settings
+# You can copy this file as ~/.eterbuild-config for per user settings
 # and uncomment any setting line
 
 #     hasher:

etersoft-build-utils/share/common

@@ -134,7 +134,7 @@ uni_rpmbuild()
 }
 
 RPMDIR="$HOME/RPM"
-[ -n "$APTCONF" ] || APTCONF=/etc/apt/apt.conf
+[ -n "$APTCONF" ] || APTCONF=/etc/eterbuild/apt/apt.conf
 #OWNERMAIL=`grep "^%packager" ~/.rpmmacros | head -n 1 | sed -e "s/%packager[ \t]*//g"`
 OWNERMAIL=`rpm --eval %packager`
 
@@ -160,8 +160,9 @@ if [ ! -d "$PKGREPLBASE" ] ; then
 fi
 
 test -f /etc/eterbuild/config && . /etc/eterbuild/config
-test -f ~/.ebconfig  && . ~/.ebconfig
 test -f ~/.eterbuild-config  && . ~/.eterbuild-config
+# obsoleted
+test -f ~/.ebconfig  && . ~/.ebconfig
 
 get_var()
 {
@@ -186,6 +187,13 @@ get_release()
 	eval_spec $1 | get_var "Release"
 }
 
+# get current release number
+get_release_number()
+{
+	$(get_release $1 | sed -e "s/alt//" | sed -e "s/%{_vendor}//" | sed -e "s/eter//" | sed -e "s/%_vendor//")
+}
+
+
 set_var()
 {
 	subst "s|\($2:\).*\$|\1 $3|" $1

etersoft-build-utils/tools/check_spec.sh

 #!/bin/sh
 # copy specs to separate tree, make rpmcs and printout diff
-. /etc/rpm/etersoft-build-functions
+. /etc/eterbuild/common
 
 cd $RPMDIR
 

etersoft-build-utils/tools/ls-incoming

@@ -2,7 +2,7 @@
 # Lists incoming dir
 # Use -M23 and so on
 
-. /etc/rpm/etersoft-build-functions
+. /etc/eterbuild/common
 
 parse_cmd_pre -- "$@"
 

etersoft-build-utils/tools/upload-to-alt

@@ -5,7 +5,7 @@
 # 25.01.2005      upload.old.xxx
 # 04.11.2005 use arg for set destination (-M23 and so on)
 
-. /etc/rpm/etersoft-build-functions
+. /etc/eterbuild/common
 
 build_list_and_args -- "$@"