SPECS (AC-branch): X11-driver-nvidia-legacy2.spec, drbd.spec, ipp2...

glen glen at pld-linux.org
Mon Oct 22 21:48:36 CEST 2007 

Author: glen                         Date: Mon Oct 22 19:48:36 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- allow build without up kernel

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy2.spec (1.1.2.19 -> 1.1.2.20) , drbd.spec (1.90.4.12 -> 1.90.4.13) , ipp2p.spec (1.52.2.11 -> 1.52.2.12) , libfuse.spec (1.76.2.11 -> 1.76.2.12) , p2p.spec (1.23.2.13 -> 1.23.2.14) , qemu.spec (1.85.2.16 -> 1.85.2.17) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.19 SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.20
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.19	Mon Oct 22 11:06:03 2007
+++ SPECS/X11-driver-nvidia-legacy2.spec	Mon Oct 22 21:48:29 2007
@@ -281,9 +281,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-nvidia-legacy2
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
@@ -316,6 +318,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.20  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.1.2.19  2007/10/22 09:06:03  hawk
 - rel 56
 

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.4.12 SPECS/drbd.spec:1.90.4.13
--- SPECS/drbd.spec:1.90.4.12	Mon Oct 15 10:26:44 2007
+++ SPECS/drbd.spec	Mon Oct 22 21:48:29 2007
@@ -188,10 +188,12 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-block-drbd
 %defattr(644,root,root,755)
 %doc ChangeLog README
 /lib/modules/%{_kernel_ver}/misc/drbd.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-block-drbd
@@ -207,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90.4.13  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.90.4.12  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.11 SPECS/ipp2p.spec:1.52.2.12
--- SPECS/ipp2p.spec:1.52.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/ipp2p.spec	Mon Oct 22 21:48:29 2007
@@ -227,9 +227,9 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-ipp2p
 %defattr(644,root,root,755)
-%if %{with up} || %{without dist_kernel}
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{name}.ko*
 %endif
 
@@ -252,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52.2.12  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.52.2.11  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/libfuse.spec
diff -u SPECS/libfuse.spec:1.76.2.11 SPECS/libfuse.spec:1.76.2.12
--- SPECS/libfuse.spec:1.76.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/libfuse.spec	Mon Oct 22 21:48:29 2007
@@ -17,6 +17,10 @@
 %undefine	with_smp
 %endif
 #
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+#
 %define		_rel	55
 Summary:	Filesystem in Userspace
 Summary(pl):	System plików w przestrzeni u¿ytkownika
@@ -49,10 +53,6 @@
 Requires(pre):	/usr/sbin/groupadd
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if !%{with kernel}
-%undefine with_dist_kernel
-%endif
-
 %description
 FUSE (Filesystem in Userspace) is a simple interface for userspace
 programs to export a virtual filesystem to the Linux kernel. FUSE also
@@ -264,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76.2.12  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.76.2.11  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.23.2.13 SPECS/p2p.spec:1.23.2.14
--- SPECS/p2p.spec:1.23.2.13	Mon Oct 15 10:26:44 2007
+++ SPECS/p2p.spec	Mon Oct 22 21:48:29 2007
@@ -186,8 +186,8 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
-%files -n kernel%{_alt_kernel}-net-p2p
 %if %{with up} || %{without dist_kernel}
+%files -n kernel%{_alt_kernel}-net-p2p
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/*
 %endif
@@ -211,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23.2.14  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.23.2.13  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.85.2.16 SPECS/qemu.spec:1.85.2.17
--- SPECS/qemu.spec:1.85.2.16	Mon Oct 22 11:00:15 2007
+++ SPECS/qemu.spec	Mon Oct 22 21:48:29 2007
@@ -317,7 +317,7 @@
 %endif
 
 %if %{with kernel}
-%if %{with up}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-kqemu
 %defattr(644,root,root,755)
 %doc kqemu-%{_kqemu_version}/LICENSE
@@ -342,6 +342,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85.2.17  2007/10/22 19:48:29  glen
+- allow build without up kernel
+
 Revision 1.85.2.16  2007/10/22 09:00:15  glen
 - allow building without up
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.19&r2=1.1.2.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.90.4.12&r2=1.90.4.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.11&r2=1.52.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libfuse.spec?r1=1.76.2.11&r2=1.76.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/p2p.spec?r1=1.23.2.13&r2=1.23.2.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.16&r2=1.85.2.17&f=u

More information about the pld-cvs-commit mailing list