SPECS (DEVEL): adapter.spec, adapter.awk - replace py_sitescriptdi...

[glen]

Author: glen                         Date: Fri Jun 17 21:47:24 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- replace py_sitescriptdir macro

---- Files affected:
SPECS:
   adapter.spec (1.26.2.4 -> 1.26.2.5) , adapter.awk (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.4 SPECS/adapter.spec:1.26.2.5
--- SPECS/adapter.spec:1.26.2.4	Sun Apr 17 00:35:54 2005
+++ SPECS/adapter.spec	Fri Jun 17 23:47:19 2005
@@ -104,6 +104,9 @@
 %attr(600,root,root) %config(noreplace) %verify(not mtime md5 size) %ghost %{supervise}/log/supervise/*
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{supervise}/log/supervise/*
 
+%dir /usr/share/python2.4/site-packages/pdlanalyzer/
+%dir %{py_sitescriptdir}/pdlanalyzer
+
 %attr(755,root,root) /etc/rc.d/init.d/%{name}
 /etc/init.d/bmc-watchdog
 %{_sysconfdir}/init.d/bmc-watchdog
@@ -129,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26.2.5  2005/06/17 21:47:19  glen
+- replace py_sitescriptdir macro
+
 Revision 1.26.2.4  2005/04/16 22:35:54  glen
 - kill "install -m\s*\d+"
 

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.158 SPECS/adapter.awk:1.159
--- SPECS/adapter.awk:1.158	Sun May  1 18:20:47 2005
+++ SPECS/adapter.awk	Fri Jun 17 23:47:19 2005
@@ -53,11 +53,11 @@
 	"rpm --eval %perl_sitearch" | getline perl_sitearch
 	"rpm --eval %perl_archlib" | getline perl_archlib
 	"rpm --eval %perl_privlib" | getline perl_privlib
-	"rpm --eval %perl_archlib" | getline perl_archlib
 	"rpm --eval %perl_vendorlib" | getline perl_vendorlib
 	"rpm --eval %perl_vendorarch" | getline perl_vendorarch
 	"rpm --eval %perl_sitelib" | getline perl_sitelib
-	"rpm --eval %perl_sitearch" | getline perl_sitearch
+
+	"rpm --eval %py_sitescriptdir" | getline py_sitescriptdir
 }
 
 # There should be a comment with CVS keywords on the first line of file.
@@ -590,11 +590,11 @@
 	gsub(perl_sitearch, "%{perl_sitearch}")
 	gsub(perl_archlib, "%{perl_archlib}")
 	gsub(perl_privlib, "%{perl_privlib}")
-	gsub(perl_archlib, "%{perl_archlib}")
 	gsub(perl_vendorlib, "%{perl_vendorlib}")
 	gsub(perl_vendorarch, "%{perl_vendorarch}")
 	gsub(perl_sitelib, "%{perl_sitelib}")
-	gsub(perl_sitearch, "%{perl_sitearch}")
+	
+	gsub(py_sitescriptdir, "%{py_sitescriptdir}")
 
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.4&r2=1.26.2.5&f=u
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.158&r2=1.159&f=u