Author: glen Date: Wed Dec 14 09:16:27 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- process docdir macro
- process macros in %post
---- Files affected:
SPECS:
adapter.awk (1.245 -> 1.246)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.245 SPECS/adapter.awk:1.246
--- SPECS/adapter.awk:1.245 Tue Dec 13 19:01:06 2005
+++ SPECS/adapter.awk Wed Dec 14 10:16:22 2005
@@ -63,6 +63,7 @@
"rpm --eval %_mandir" | getline mandir
"rpm --eval %_infodir" | getline infodir
"rpm --eval %_examplesdir" | getline examplesdir
+ "rpm --eval %_defaultdocdir" | getline docdir
"rpm --eval %perl_sitearch" | getline perl_sitearch
"rpm --eval %perl_archlib" | getline perl_archlib
@@ -200,6 +201,8 @@
mandir = $3
if ($2 ~ /_infodir/)
infodir = $3
+ if ($2 ~ /_docdir/)
+ docdir = $3
# version related macros
if ($2 ~ /^_beta$/)
@@ -517,6 +520,7 @@
/^%post/, (!/^%post/ && $0 ~ SECTIONS) {
preamble = 0
+ use_macros()
}
/^%preun/, (!/^%preun/ && $0 ~ SECTIONS) {
preamble = 0
@@ -904,6 +908,8 @@
gsub(sysconfdir, "%{_sysconfdir}", $c)
}
+ gsub(docdir, "%{_docdir}")
+
for (c = 1; c <= NF; c++) {
if ($c ~ datadir "/automake")
continue;
@@ -914,10 +920,6 @@
gsub(datadir, "%{_datadir}", $c)
}
- gsub("%_sbindir", "%{_sbindir}")
- gsub("%_mandir", "%{_mandir}")
- gsub("%name", "%{name}")
-
gsub("%{prefix}/share", "%{_datadir}")
if (prefix"/share" == datadir)
gsub("%{_prefix}/share", "%{_datadir}")
@@ -1017,6 +1019,9 @@
gsub("%_bindir", "%{_bindir}")
gsub("%_datadir", "%{_datadir}")
gsub("%_iconsdir", "%{_iconsdir}")
+ gsub("%_sbindir", "%{_sbindir}")
+ gsub("%_mandir", "%{_mandir}")
+ gsub("%name", "%{name}")
gsub("/usr/src/linux", "%{_kernelsrcdir}")
gsub("%{_prefix}/src/linux", "%{_kernelsrcdir}")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.245&r2=1.246&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
