SPECS: initng.spec - more lib64 fixes: search plugins from proper dir

[glen]

Author: glen                         Date: Thu Jun 30 17:24:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more lib64 fixes: search plugins from proper dir

---- Files affected:
SPECS:
   initng.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/initng.spec
diff -u SPECS/initng.spec:1.8 SPECS/initng.spec:1.9
--- SPECS/initng.spec:1.8	Thu Jun 30 19:09:36 2005
+++ SPECS/initng.spec	Thu Jun 30 19:24:20 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - plugins build doesn't pass CFLAGS
 Summary:	A next generation init replacement
 Summary(pl):	Zamiennik inita następnej generacji
 Name:		initng
@@ -10,6 +12,7 @@
 Source0:	http://initng.thinktux.net/download/%{name}-%{version}.tar.bz2
 # Source0-md5:	de9cb47d71792a1a9d47029549d0dfcc
 Patch0:		%{name}-FHS.patch
+Patch1:		%{name}-lib64.patch
 Requires:	bash
 URL:		http://jw.dyndns.org/initng/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,15 +38,16 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -C ngcontrol \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
+	CFLAGS='%{rpmcflags}' \
+	LDFLAGS='%{rpmldflags}'
 
 %{__make} -C src \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
+	CFLAGS='-DINITNG_PLUGIN_DIR=\"/%{_lib}/%{name}\" %{rpmcflags}' \
+	LDFLAGS='%{rpmldflags}'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -142,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/06/30 17:24:20  glen
+- more lib64 fixes: search plugins from proper dir
+
 Revision 1.8  2005/06/30 17:09:36  glen
 - fix build on amd64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.8&r2=1.9&f=u