packages: rpm-build-tools/adapter.awk, rpm-build-tools/adapter.sh, rpm-buil...

[glen]

Author: glen                         Date: Sun Jun 28 17:04:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- v0.35

---- Files affected:
packages/rpm-build-tools:
   adapter.awk (1.9 -> 1.10) , adapter.sh (1.5 -> 1.6) , builder.sh (1.25 -> 1.26) , rpm-build-tools.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/rpm-build-tools/adapter.awk
diff -u packages/rpm-build-tools/adapter.awk:1.9 packages/rpm-build-tools/adapter.awk:1.10
--- packages/rpm-build-tools/adapter.awk:1.9	Sun Jun 28 19:01:29 2009
+++ packages/rpm-build-tools/adapter.awk	Sun Jun 28 19:04:45 2009
@@ -33,7 +33,7 @@
 
 	RCSID = "$Id$"
 	rev = RCSID # TODO: parse from RCSID
-	VERSION = "0.31/" rev
+	VERSION = "0.35/" rev
 
 	PREAMBLE_TAGS = "(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires|Suggests|Auto(Req|Prov))"
 

================================================================
Index: packages/rpm-build-tools/adapter.sh
diff -u packages/rpm-build-tools/adapter.sh:1.5 packages/rpm-build-tools/adapter.sh:1.6
--- packages/rpm-build-tools/adapter.sh:1.5	Sun Jun 28 18:59:25 2009
+++ packages/rpm-build-tools/adapter.sh	Sun Jun 28 19:04:45 2009
@@ -15,7 +15,7 @@
 RCSID='$Id$'
 r=${RCSID#* * }
 rev=${r%% *}
-VERSION="v0.31/$rev"
+VERSION="v0.35/$rev"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
 $VERSION (C) 1999-2009 Free Penguins".

================================================================
Index: packages/rpm-build-tools/builder.sh
diff -u packages/rpm-build-tools/builder.sh:1.25 packages/rpm-build-tools/builder.sh:1.26
--- packages/rpm-build-tools/builder.sh:1.25	Sun Jun 28 18:55:30 2009
+++ packages/rpm-build-tools/builder.sh	Sun Jun 28 19:04:45 2009
@@ -28,7 +28,7 @@
 RCSID='$Id$'
 r=${RCSID#* * }
 rev=${r%% *}
-VERSION="v0.23/$rev"
+VERSION="v0.35/$rev"
 VERSIONSTRING="\
 Build package utility from PLD Linux CVS repository
 $VERSION (C) 1999-2009 Free Penguins".
@@ -453,7 +453,6 @@
 %ruby_ver_requires_eq() %{nil}
 %ruby_mod_ver_requires_eq() %{nil}
 %__php_api_requires() %{nil}
-%__php /usr/bin/php
 %php_major_version ERROR
 %php_api_version ERROR
 %requires_xorg_xserver_extension %{nil}
@@ -662,8 +661,8 @@
 
 	if [ "$NOINIT" != "yes" ] ; then
 		TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
-		REPO_DIR=$TOP_DIR
-		PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
+		REPO_DIR=$TOP_DIR/packages
+		PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME
 	else
 		REPO_DIR="."
 		PACKAGE_DIR="."

================================================================
Index: packages/rpm-build-tools/rpm-build-tools.spec
diff -u packages/rpm-build-tools/rpm-build-tools.spec:1.17 packages/rpm-build-tools/rpm-build-tools.spec:1.18
--- packages/rpm-build-tools/rpm-build-tools.spec:1.17	Sun Jun 28 18:45:40 2009
+++ packages/rpm-build-tools/rpm-build-tools.spec	Sun Jun 28 19:04:45 2009
@@ -6,8 +6,8 @@
 Summary(ru.UTF-8):	Скрипты и утилиты, необходимые для сборки пакетов
 Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для побудови пакетів
 Name:		rpm-build-tools
-Version:	4.4.9
-Release:	18
+Version:	4.4.35
+Release:	1
 License:	GPL
 Group:		Applications/File
 Group:		Base
@@ -82,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/06/28 17:04:45  glen
+- v0.35
+
 Revision 1.17  2009/06/28 16:45:40  glen
 - remove conflicting files instead
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-tools/adapter.awk?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-tools/adapter.sh?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-tools/builder.sh?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-tools/rpm-build-tools.spec?r1=1.17&r2=1.18&f=u