SPECS: zaptel.spec - sed 2 patch, LDFLAGS patch

[sparky]

Author: sparky                       Date: Wed Aug  2 02:49:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sed 2 patch, LDFLAGS patch

---- Files affected:
SPECS:
   zaptel.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.62 SPECS/zaptel.spec:1.63
--- SPECS/zaptel.spec:1.62	Tue Jun  6 00:10:11 2006
+++ SPECS/zaptel.spec	Wed Aug  2 04:49:18 2006
@@ -24,13 +24,14 @@
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-sparc.patch
+Patch2:		%{name}-LIBDIR.patch
+Patch3:		%{name}-LDFLAGS.patch
 URL:		http://www.asterisk.org/
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel-module-build
 %endif
 BuildRequires:	newt-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -108,13 +109,15 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-sed -i -e "s#/usr/lib#%{_libdir}#g#" Makefile
+%patch2 -p1
+%patch3 -p1
 
 %define buildconfigs %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 
 %build
 %{__make} prereq zttest \
 	CC="%{__cc}" \
+	LDFLAGS="%{rpmldflags}" \
 	OPTFLAGS="%{rpmcflags}"
 
 %if %{with kernel}
@@ -146,7 +149,8 @@
 %if %{with userspace}
 %{__make} ztcfg torisatool makefw ztmonitor ztspeed libtonezone.so \
 	fxstest fxotune \
-	CC="%{__cc} %{rpmcflags}"
+	CC="%{__cc} %{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 %endif
 
 %install
@@ -169,6 +173,7 @@
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{/sbin,%{_includedir}/linux,/etc/{rc.d/init.d,sysconfig},%{_sbindir},%{_mandir}/{man1,man8}}
 %{__make} -o all -o devices install \
+	LIBDIR="%{_libdir}" \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT \
 	MODCONF=$RPM_BUILD_ROOT/etc/modprobe.conf
 install zttest torisatool makefw ztmonitor ztspeed fxstest fxotune $RPM_BUILD_ROOT%{_sbindir}
@@ -244,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2006/08/02 02:49:18  sparky
+- sed 2 patch, LDFLAGS patch
+
 Revision 1.62  2006/06/05 22:10:11  areq
 - 1.2.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.62&r2=1.63&f=u