- v0.35

Changed files:
    adapter.awk -> 1.423
    adapter.sh -> 1.39
    adapter_.awk -> 1.10
    adapter_.sh -> 1.6
    builder.sh -> 1.586
    builder_.sh -> 1.26
    rpm-build-tools.spec -> 1.18

diff --git a/adapter.awk b/adapter.awk
index 6b5bba0589d8a1408c019ddf2a5dd6c5c3435595..c3bde7f6614f9d73579744a863ad586c272af557 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -33,7 +33,7 @@ BEGIN {
 
        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))"
 

diff --git a/adapter.sh b/adapter.sh
index 4f6920e4bea1b7ff25b1c101c78f825bbec5e31f..e497e65b93546de5b2285c3c6ceaef94e161ec90 100644 (file)
--- a/adapter.sh
+++ b/adapter.sh
@@ -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".

diff --git a/adapter_.awk b/adapter_.awk
index 6b5bba0589d8a1408c019ddf2a5dd6c5c3435595..c3bde7f6614f9d73579744a863ad586c272af557 100644 (file)
--- a/adapter_.awk
+++ b/adapter_.awk
@@ -33,7 +33,7 @@ BEGIN {
 
        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))"
 

diff --git a/adapter_.sh b/adapter_.sh
index 4f6920e4bea1b7ff25b1c101c78f825bbec5e31f..e497e65b93546de5b2285c3c6ceaef94e161ec90 100644 (file)
--- a/adapter_.sh
+++ b/adapter_.sh
@@ -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".

diff --git a/builder.sh b/builder.sh
index 23f55daccba01c88722e36affd7d71ff33347a75..a7d401b892a5cfabaccd0e70dbdb55fe55043cc7 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -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".

diff --git a/builder_.sh b/builder_.sh
index d54fe4e8e6201b0929a75304ef09405d92e7f8cd..a7d401b892a5cfabaccd0e70dbdb55fe55043cc7 100644 (file)
--- a/builder_.sh
+++ b/builder_.sh
@@ -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 @@ minirpm() {
 %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 @@ init_builder() {
 
        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="."

diff --git a/rpm-build-tools.spec b/rpm-build-tools.spec
index 59ad0473284f064031aacd03031baeda9a1fef88..6604f519de455f84b07df57e22c7b977eb2a0242 100644 (file)
--- a/rpm-build-tools.spec
+++ b/rpm-build-tools.spec
@@ -5,8 +5,8 @@ Summary(pt_BR.UTF-8):   Scripts e programas executáveis usados para construir pac
 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