- adapterized man.spec openoffice.spec wxGTK.spec

Changed files:
    adapter.awk -> 1.108

diff --git a/adapter.awk b/adapter.awk
index 51305889f7f5be5c134da85dfc2900051dafa195..ea72b3fec65100435fb8d0cd9f7d1982d5fb0e94 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -546,7 +546,7 @@ function use_macros()
                gsub("%{_prefix}/lib", "%{_libdir}")
 
        for (c = 1; c <= NF; c++) {
-               if ($c ~ sysconfdir "/{?cron.d")
+               if ($c ~ sysconfdir "/{?cron.")
                        continue;
                if ($c ~ sysconfdir "/{?crontab.d")
                        continue;
@@ -589,7 +589,9 @@ function use_macros()
        gsub("%{prefix}/info", "%{_infodir}")
        gsub("%{_prefix}/info", "%{_infodir}")
 
-       gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+       if (prefix !~ "/X11R6") {
+               gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+       }
 
        if (prefix != "/") {
                for (c = 1; c <= NF; c++) {