Author: hawk Date: Fri Sep 25 11:44:18 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- userspace bcond
---- Files affected:
packages/dahdi-linux:
dahdi-linux.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/dahdi-linux/dahdi-linux.spec
diff -u packages/dahdi-linux/dahdi-linux.spec:1.15
packages/dahdi-linux/dahdi-linux.spec:1.16
--- packages/dahdi-linux/dahdi-linux.spec:1.15 Fri Sep 25 13:29:53 2009
+++ packages/dahdi-linux/dahdi-linux.spec Fri Sep 25 13:44:13 2009
@@ -15,8 +15,13 @@
%bcond_without dist_kernel # without distribution kernel
%bcond_with oslec # with Open Source Line Echo Canceller
%bcond_without xpp # without Astribank
+%bcond_without userspace # don't build userspace packages
%bcond_with verbose
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
+%endif
+
%ifarch sparc
%undefine with_smp
%endif
@@ -24,7 +29,7 @@
%undefine with_xpp
%endif
-%define rel 2
+%define rel 3
%define pname dahdi-linux
%define FIRMWARE_URL
http://downloads.digium.com/pub/telephony/firmware/releases
Summary: DAHDI telephony device support
@@ -165,12 +170,14 @@
%install_kernel_modules -m %{modules_in} -d misc
cd ../..
+%if %{with userspace}
install -d $RPM_BUILD_ROOT/etc/udev/rules.d
%{make} \
DESTDIR=$RPM_BUILD_ROOT \
install-devices \
install-include
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -181,6 +188,7 @@
%postun -n kernel%{_alt_kernel}-%{pname}
%depmod %{_kernel_ver}
+%if %{with userspace}
%files devel
%defattr(644,root,root,755)
%{_includedir}/dahdi
@@ -189,6 +197,7 @@
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/dahdi.rules
%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/xpp.rules
+%endif
%files -n kernel%{_alt_kernel}-%{pname}
%defattr(644,root,root,755)
@@ -200,6 +209,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2009/09/25 11:44:13 hawk
+- userspace bcond
+
Revision 1.15 2009/09/25 11:29:53 hawk
- udev rules require /usr/share/dahdi/xpp_fxloader, R: dahdi-tools
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
