Author: glen Date: Thu Feb 24 11:01:41 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- skip replace of /usr/share/automake with datadir/prefix macro
---- Files affected:
SPECS:
adapter.awk (1.132 -> 1.133) , adapter.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.132 SPECS/adapter.awk:1.133
--- SPECS/adapter.awk:1.132 Mon Feb 21 09:46:42 2005
+++ SPECS/adapter.awk Thu Feb 24 12:01:34 2005
@@ -593,9 +593,14 @@
gsub(sysconfdir, "%{_sysconfdir}", $c)
}
- gsub(datadir, "%{_datadir}")
+ for (c = 1; c <= NF; c++) {
+ if ($c ~ datadir "/automake")
+ continue;
+ gsub(datadir, "%{_datadir}", $c)
+ }
+
gsub("%{prefix}/share", "%{_datadir}")
- if(prefix"/share" == datadir)
+ if (prefix"/share" == datadir)
gsub("%{_prefix}/share", "%{_datadir}")
gsub(includedir, "%{_includedir}")
@@ -622,6 +627,8 @@
if (prefix != "/") {
for (c = 1; c <= NF; c++) {
if ($c ~ prefix "/sbin/fix-info-dir")
+ continue;
+ if ($c ~ prefix "/share/automake")
continue;
gsub(prefix, "%{_prefix}", $c)
}
================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.7 SPECS/adapter.spec:1.8
--- SPECS/adapter.spec:1.7 Mon Feb 21 09:46:42 2005
+++ SPECS/adapter.spec Thu Feb 24 12:01:34 2005
@@ -55,6 +55,8 @@
%build
%{__make}
+cp -f /usr/share/automake/config.sub src/applets/kde/admin
+cp -f /usr/share/automake/config.sub config
%install
rm -rf $RPM_BUILD_ROOT
@@ -92,6 +94,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2005/02/24 11:01:34 glen
+- skip replace of /usr/share/automake with datadir/prefix macro
+
Revision 1.7 2005/02/21 08:46:42 glen
- updated sourceforge filter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.132&r2=1.133&f=u
http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
