packages (Titanium): kernel-desktop/kernel-desktop.spec - conditional union...

[shadzik]

Author: shadzik                      Date: Fri Jan  7 16:05:17 2011 GMT
Module: packages                      Tag: Titanium
---- Log message:
- conditional unionfs patch

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.153 -> 1.204.2.154) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.153 packages/kernel-desktop/kernel-desktop.spec:1.204.2.154
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.153	Thu Jan  6 20:33:14 2011
+++ packages/kernel-desktop/kernel-desktop.spec	Fri Jan  7 17:05:11 2011
@@ -104,6 +104,7 @@
 Patch3:		kernel-desktop-grsec-minimal.patch
 # sreadahead - get it from http://code.google.com/p/sreadahead/source/browse/trunk/0001-kernel-trace-open.patch
 Patch4:		kernel-desktop-trace-open.patch
+Patch5:		kernel-desktop-super_sched.patch
 
 #### End patches ##
 URL:		http://www.kernel.org/
@@ -414,9 +415,11 @@
 %endif
 
 # kernel-desktop-bootsplash.patch
-%patch0 -p1
+#%patch0 -p1
 # unionfs
+%if %{with unionfs}
 %patch1 -p1
+%endif
 # TuxOnIce
 %if %{with tuxonice}
 %{__bzip2} -dc %{SOURCE100} | patch -p1 -s
@@ -433,6 +436,7 @@
 %endif
 # Con Kolivas patchset
 %{__bzip2} -dc %{SOURCE101} | patch -p1 -s
+%patch5 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION :=.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -961,6 +965,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.154  2011/01/07 16:05:11  shadzik
+- conditional unionfs patch
+
 Revision 1.204.2.153  2011/01/06 19:33:14  shadzik
 - Linux 2.6.37
 - rel 0.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.153&r2=1.204.2.154&f=u