commit a877f3a5f43ea28d01d26894bbc02089fea90d12
Author: Elan Ruusamäe <[email protected]>
Date: Wed Apr 29 08:34:27 2009 +0000
- fix rpm.groups handling
Changed files:
adapter.awk -> 1.419
adapter.sh -> 1.38
adapter.awk | 9 +++++----
adapter.sh | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index eb2bcf0..94495e9 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -56,9 +56,10 @@ BEGIN {
import_rpm_macros()
- groups_file = sourcedir "/rpm.groups"
+ packages_dir = topdir "/packages"
+ groups_file = packages_dir "/rpm.groups"
- system("cd `rpm --eval %_sourcedir`; [ -f rpm.groups ] || cvs up
rpm.groups >/dev/null")
+ system("cd "packages_dir"; [ -f rpm.groups ] || cvs up rpm.groups >
/dev/null")
system("[ -d ../PLD-doc ] && cd ../PLD-doc && ([ -f BuildRequires.txt ]
|| cvs up BuildRequires.txt >/dev/null)");
# Temporary file for changelog section
@@ -1753,9 +1754,9 @@ function replace_php_virtual_deps()
# you should update the list also in adapter when making changes here
function import_rpm_macros() {
# File with rpm groups
- sourcedir = ENVIRON["_sourcedir"]
+ topdir = ENVIRON["_topdir"]
- if (!sourcedir) {
+ if (!topdir) {
print "adapter.awk should not not be invoked directly, but via
adapter script" > "/dev/stderr"
do_not_touch_anything = 1
exit(1);
diff --git a/adapter.sh b/adapter.sh
index 06340ae..4f6920e 100644
--- a/adapter.sh
+++ b/adapter.sh
@@ -148,7 +148,7 @@ for my $filename (@ARGV) {
# you should update the list also in adapter.awk when making changes here
import_rpm_macros() {
macros="
- _sourcedir
+ _topdir
_prefix
_bindir
_sbindir
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
