packages: wanpipe/wanpipe.spec - added recfnt and kbuild patches - switched...

[sparky]

Author: sparky                       Date: Sun Apr 17 13:42:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added recfnt and kbuild patches
- switched to %*_kernel_modules macros
- manually call autotools

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

---- Diffs:

================================================================
Index: packages/wanpipe/wanpipe.spec
diff -u packages/wanpipe/wanpipe.spec:1.56 packages/wanpipe/wanpipe.spec:1.57
--- packages/wanpipe/wanpipe.spec:1.56	Fri Apr 15 22:11:12 2011
+++ packages/wanpipe/wanpipe.spec	Sun Apr 17 15:42:41 2011
@@ -26,11 +26,16 @@
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-setup.patch
 Patch3:		%{name}-include-limits.patch
+Patch4:		%{name}-kbuild.patch
+Patch5:		%{name}-refcnt.patch
 URL:		http://www.sangoma.com/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bison
 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
@@ -76,33 +81,40 @@
 Ten pakiet zawiera moduł WANPIPE dla Linuksa.
 
 %prep
-%setup -q 
+%setup -q
 #%patch0 -p1
 #%patch1 -p1
 %patch2 -p1
 #%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 sed -i 's#EXTRA_UTIL_FLAGS = #EXTRA_UTIL_FLAGS = -I/usr/include/ncurses #' Makefile
 sed -i 's#<ncurses.h>#<ncurses/ncurses.h>#' util/lxdialog/Makefile
 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
 
 %build
+cd api/libstelephony
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ../..
+
+%{__make} all_kmod_dahdi all_util all_lib \
+	DAHDI_DIR=/usr \
+	INSTALLPREFIX=%{buildroot}
 
 %if %{with kernel}
-	cfg=%{!?with_dist_kernel:non}dist
-	install -d o/include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
-	export KBUILD_MODPOST_WARN=1
-
-	%{__make} dahdi DAHDI_DIR=/usr KDIR=$PWD/o KVER=%{_kernel_ver} INSTALLPREFIX=%{buildroot}
-	
+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
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig},/var/log} \
@@ -125,14 +137,8 @@
 touch $RPM_BUILD_ROOT/var/log/wanrouter
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/{net/wanrouter,drivers/net/wan}
-
-install  patches/kdrivers/src/net/{wanec,af_wanpipe,wanrouter}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/wanrouter
-
-install  patches/kdrivers/src/net/{sdladrv,wanpipe_syncppp,wanpipe,wan_aften}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan
-
+%install_kernel_modules -m patches/kdrivers/src/net/{wanec,af_wanpipe,wanrouter} -d kernel/net/wanrouter
+%install_kernel_modules -m patches/kdrivers/src/net/{sdladrv,wanpipe_syncppp,wanpipe,wan_aften} -d kernel/drivers/net/wan
 %endif
 
 %clean
@@ -186,6 +192,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2011/04/17 13:42:41  sparky
+- added recfnt and kbuild patches
+- switched to %*_kernel_modules macros
+- manually call autotools
+
 Revision 1.56  2011/04/15 20:11:12  areq
 - 3.5.20
 
================================================================

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