- disable get_epoch for now (anyone want to fix it?)

[packages/adapter.git] / adapter.awk

diff --git a/adapter.awk b/adapter.awk
index 0a74f71a8188307a31972e156fbb28cba57d28e5..1e912456c6cf3478818f958c47437f3df5fd55ca 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -53,7 +53,7 @@ BEGIN {
        "rpm --eval %_sourcedir" | getline groups_file
        groups_file = groups_file "/rpm.groups"
        system("cd `rpm --eval %_sourcedir`; [ -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")
+       system("[ -d ../PLD-doc ] && cd ../PLD-doc && ([ -f BuildRequires.txt ] || cvs up BuildRequires.txt >/dev/null)");
 
        # Temporary file for changelog section
        changelog_file = ENVIRON["HOME"] "/tmp/adapter.changelog"
@@ -368,8 +368,10 @@ function b_makekey(a, b,   s) {
        $0 = fixedsub("glib-gettextize --copy --force","%{__glib_gettextize}", $0);
        $0 = fixedsub("intltoolize --copy --force", "%{__intltoolize}", $0);
        $0 = fixedsub("automake --add-missing --copy", "%{__automake}", $0);
-       $0 = fixedsub("libtoolize -c -f --automake", "%{__libtoolize}", $0);
+       $0 = fixedsub("automake -a --foreign --copy", "%{__automake}", $0);
        $0 = fixedsub("automake -a -c --foreign", "%{__automake}", $0);
+       $0 = fixedsub("libtoolize --force --automake --copy", "%{__libtoolize}", $0);
+       $0 = fixedsub("libtoolize -c -f --automake", "%{__libtoolize}", $0);
 
        sub(/^aclocal$/, "%{__aclocal}");
        sub(/^autoheader$/, "%{__autoheader}");
@@ -1306,6 +1308,11 @@ function kill_preamble_macros()
 
 function get_epoch(pkg, ver,   epoch)
 {
+       return
+# should parse the BR lines more adequately:
+#      freetype = 2.0.0 -> correct
+#      freetype = 2.1.9 -> with epoch 1, as epoch 1 was added in 2.1.7
+
        shell = "grep -o '^" pkg ":[^:]\+' ../PLD-doc/BuildRequires.txt | awk '{print $NF}'";
        shell | getline epoch;
        return epoch;