Author: glen Date: Wed Mar 14 00:22:14 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up bcond
---- Files affected:
SPECS:
lirc.spec (1.136 -> 1.137) , lirc24.spec (1.126 -> 1.127) , ltmodem.spec
(1.47 -> 1.48) , mISDN.spec (1.23 -> 1.24)
---- Diffs:
================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.136 SPECS/lirc.spec:1.137
--- SPECS/lirc.spec:1.136 Fri Feb 23 07:49:28 2007
+++ SPECS/lirc.spec Wed Mar 14 01:22:09 2007
@@ -5,6 +5,7 @@
# Conditional build:
%bcond_without dist_kernel # without sources of distribution kernel
%bcond_without kernel # don't build kernel modules, only
library+programs
+%bcond_without up # don't build UP module
%bcond_without smp # don't build SMP module
%bcond_without userspace # build only packages with kernel modules
%bcond_without svga # without svgalib-based utility
@@ -1403,6 +1404,7 @@
%endif
%if %{with kernel}
+%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-char-lirc-atiusb
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/*/lirc_atiusb*
@@ -1462,6 +1464,7 @@
%files -n kernel%{_alt_kernel}-char-lirc-sir
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/*/lirc_sir*
+%endif
%if %{with smp}
%files -n kernel%{_alt_kernel}-smp-char-lirc-atiusb
@@ -1535,6 +1538,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.137 2007/03/14 00:22:09 glen
+- up bcond
+
Revision 1.136 2007/02/23 06:49:28 sls
- added kernel-2.6.20.patch
================================================================
Index: SPECS/lirc24.spec
diff -u SPECS/lirc24.spec:1.126 SPECS/lirc24.spec:1.127
--- SPECS/lirc24.spec:1.126 Tue Feb 13 07:46:52 2007
+++ SPECS/lirc24.spec Wed Mar 14 01:22:09 2007
@@ -5,6 +5,7 @@
# Conditional build:
%bcond_without dist_kernel # without sources of distribution kernel
%bcond_without kernel # don't build kernel modules, only
library+programs
+%bcond_without up # don't build UP module
%bcond_without smp # don't build SMP module
%bcond_without userspace # build only packages with kernel modules
%bcond_without svga # without svgalib-based utility
@@ -1401,6 +1402,7 @@
%endif
%if %{with kernel}
+%if %{with up} || %{without dist_kernel}
%files -n kernel24-char-lirc-atiusb
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/*/lirc_atiusb*
@@ -1513,6 +1515,7 @@
%files -n kernel24-smp-char-lirc-streamzap
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/*/lirc_streamzap*
+%endif
# currently not SMP-safe
%if 0
@@ -1533,6 +1536,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.127 2007/03/14 00:22:09 glen
+- up bcond
+
Revision 1.126 2007/02/13 06:46:52 glen
- tabs in preamble
================================================================
Index: SPECS/ltmodem.spec
diff -u SPECS/ltmodem.spec:1.47 SPECS/ltmodem.spec:1.48
--- SPECS/ltmodem.spec:1.47 Tue Feb 13 07:46:52 2007
+++ SPECS/ltmodem.spec Wed Mar 14 01:22:09 2007
@@ -2,6 +2,7 @@
#
# Conditional build:
%bcond_without dist_kernel # without kernel from distribution
+%bcond_without up # build the UP driver
%bcond_without smp # build the SMP driver
%bcond_with verbose # verbose build (V=1)
@@ -161,12 +162,14 @@
%postun -n kernel-smp-char-ltmodem
%depmod %{_kernel_ver}smp
+%if %{with up} || %{without dist_kernel}
%files -n kernel-char-ltmodem
%defattr(644,root,root,755)
%doc docs/*
/lib/modules/%{_kernel_ver}/*/*
+%endif
-%if %{with smp}
+%if %{with smp} && %{with dist_kernel}
%files -n kernel-smp-char-ltmodem
%defattr(644,root,root,755)
%doc docs/*
@@ -179,6 +182,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2007/03/14 00:22:09 glen
+- up bcond
+
Revision 1.47 2007/02/13 06:46:52 glen
- tabs in preamble
================================================================
Index: SPECS/mISDN.spec
diff -u SPECS/mISDN.spec:1.23 SPECS/mISDN.spec:1.24
--- SPECS/mISDN.spec:1.23 Thu Feb 22 13:42:11 2007
+++ SPECS/mISDN.spec Wed Mar 14 01:22:09 2007
@@ -2,6 +2,7 @@
#
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
+%bcond_without up # don't build UP module
%bcond_without smp # don't build SMP module
%bcond_with verbose # verbose build (V=1)
#
@@ -141,10 +142,12 @@
%postun -n kernel-smp-isdn-mISDN
%depmod %{_kernel_ver}smp
+%if %{with up} || %{without dist_kernel}
%files -n kernel-isdn-mISDN
%defattr(644,root,root,755)
%dir /lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN
/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/*.ko*
+%endif
%if %{with smp} && %{with dist_kernel}
%files -n kernel-smp-isdn-mISDN
@@ -163,6 +166,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2007/03/14 00:22:09 glen
+- up bcond
+
Revision 1.23 2007/02/22 12:42:11 marcus
- up to 1.1.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/lirc.spec?r1=1.136&r2=1.137&f=u
http://cvs.pld-linux.org/SPECS/lirc24.spec?r1=1.126&r2=1.127&f=u
http://cvs.pld-linux.org/SPECS/ltmodem.spec?r1=1.47&r2=1.48&f=u
http://cvs.pld-linux.org/SPECS/mISDN.spec?r1=1.23&r2=1.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
