Author: glen Date: Mon Feb 28 18:50:48 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- avoid defining sysconfdir with rpm %() eval
---- Files affected:
SPECS:
adapter.awk (1.135 -> 1.136) , adapter.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.135 SPECS/adapter.awk:1.136
--- SPECS/adapter.awk:1.135 Sun Feb 27 16:04:18 2005
+++ SPECS/adapter.awk Mon Feb 28 19:50:42 2005
@@ -478,7 +478,7 @@
sbindir = $3
if ($2 ~ /_libdir/)
libdir = $3
- if ($2 ~ /_sysconfdir/)
+ if ($2 ~ /_sysconfdir/ && $3 !~ /^%\(/)
sysconfdir = $3
if ($2 ~ /_datadir/)
datadir = $3
@@ -743,4 +743,3 @@
sub("\$RPM_OPT_FLAGS", "%{rpmcflags}")
return 1
}
-
================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.10 SPECS/adapter.spec:1.11
--- SPECS/adapter.spec:1.10 Sun Feb 27 16:04:18 2005
+++ SPECS/adapter.spec Mon Feb 28 19:50:42 2005
@@ -2,6 +2,7 @@
# Conditional build:
%bcond_with tests # build with tests
%bcond_without tests # build without tests
+%define apxs %{_sbindir}/apxs1
Summary: Package for testing adapter.awk
Summary(et): Pakk adapter.awk testimiseks
Name: adapter
@@ -43,6 +44,8 @@
Obsoletes: zmailer
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+
%description
- qmail-fix - a small utility for checking and repairing the qmail
queue structure,
@@ -98,6 +101,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2005/02/28 18:50:42 glen
+- avoid defining sysconfdir with rpm %() eval
+
Revision 1.10 2005/02/27 15:04:18 glen
- 754 permissions for init.d scripts
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.135&r2=1.136&f=u
http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
