packages: wanpipe/wanpipe.spec - must include Makefile.kbuild before ifdef

[sparky]

Author: sparky                       Date: Sat Apr 30 20:16:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- must include Makefile.kbuild before ifdef

---- Files affected:
packages/wanpipe:
   wanpipe.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: packages/wanpipe/wanpipe.spec
diff -u packages/wanpipe/wanpipe.spec:1.57 packages/wanpipe/wanpipe.spec:1.58
--- packages/wanpipe/wanpipe.spec:1.57	Sun Apr 17 15:42:41 2011
+++ packages/wanpipe/wanpipe.spec	Sat Apr 30 22:15:56 2011
@@ -32,13 +32,14 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	dahdi-linux-devel
 BuildRequires:	flex
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.22}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	rpmbuild(macros) >= 1.379
-BuildRequires:	dahdi-linux-devel
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -94,8 +95,8 @@
 sed -i 's#MODULE_EXT=".ko"#MODULE_EXT=".ko.gz"#' util/lxdialog/Makefile
 sed -i 's/libstelephony\.cpp//; s#libstelephony_la_SOURCES *=#libstelephony_la_SOURCES = libstelephony.cpp#' api/libstelephony/Makefile.am
 sed -i '/lib_LIBRARIES/d; /libstelephony_a_CXXFLAGS/d' -i api/libstelephony/Makefile.am
-#echo 'EXTRA_CFLAGS += -D__LINUX__ -I$(HOMEDIR)/patches/kdrivers/include' >> patches/kdrivers/src/net/Makefile
-#grep "PRODUCT_DEFINES" Makefile >> patches/kdrivers/src/net/Makefile
+
+sed "1a\include $(pwd)/Makefile.kbuild" -i patches/kdrivers/src/net/Makefile
 
 %build
 cd api/libstelephony
@@ -110,7 +111,6 @@
 	INSTALLPREFIX=%{buildroot}
 
 %if %{with kernel}
-echo "include $(pwd)/Makefile.kbuild" >> patches/kdrivers/src/net/Makefile
 %build_kernel_modules -C patches/kdrivers/src/net -m {af_wanpipe,sdladrv,wanrouter,wanpipe,wanpipe_syncppp,wanec,wan_aften}
 %endif
 
@@ -192,6 +192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2011/04/30 20:15:56  sparky
+- must include Makefile.kbuild before ifdef
+
 Revision 1.57  2011/04/17 13:42:41  sparky
 - added recfnt and kbuild patches
 - switched to %*_kernel_modules macros
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wanpipe/wanpipe.spec?r1=1.57&r2=1.58&f=u