packages (Titanium): kernel-desktop/kernel-desktop.spec - fix EXTRAVERSION ...

[cactus]

Author: cactus                       Date: Thu Oct 13 20:31:01 2011 GMT
Module: packages                      Tag: Titanium
---- Log message:
- fix EXTRAVERSION
- unionfs up to 2.5.10
- BFS up to 411

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.161 -> 1.204.2.162) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.161 packages/kernel-desktop/kernel-desktop.spec:1.204.2.162
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.161	Wed Sep 28 00:08:17 2011
+++ packages/kernel-desktop/kernel-desktop.spec	Thu Oct 13 22:30:56 2011
@@ -46,7 +46,7 @@
 
 %define		_basever		3.0
 %define		_postver		.4
-%define		_rel			0.5
+%define		_rel			1
 
 %define		_enable_debug_packages			0
 
@@ -97,8 +97,10 @@
 #Source101:		http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/2.6.39/2.6.39-ck2/patch-2.6.39-ck2.bz2
 Source101:		http://ck.kolivas.org/patches/bfs/test/3.0-sched-bfs-410.patch
 # Source101-md5:	9f505f974c2f52f3acf86be3270948ee
-Source102:		http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz
-# Source102-md5:	a5e946f8adead719d233eb63fc906bb7
+Source102:		http://ck.kolivas.org/patches/bfs/test/3.0-bfs410-411.patch
+# Source102-md5:	d88b88ec02ca29646a345f5bf0550dc3
+Source110:		http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.5.10_for_3.0.4.diff.gz
+# Source110-md5:	5398834bc41b4be7e95f5b66de465980
 Patch0:		kernel-desktop-bootsplash.patch
 Patch1:		kernel-desktop-unionfs.patch
 Patch2:		kernel-desktop-small_fixes.patch
@@ -437,15 +439,16 @@
 # Con Kolivas patchset
 #%{__bzip2} -dc %{SOURCE101} | patch -p1 -s
 patch -p1 < %{SOURCE101}
+patch -p1 < %{SOURCE102}
 #%patch5 -p1
 
 # unionfs
 %if %{with unionfs}
-%{__gzip} -dc  %{SOURCE102} | patch -p1 -s
+%{__gzip} -dc  %{SOURCE110} | patch -p1 -s
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION :=.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -971,6 +974,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.162  2011/10/13 20:30:56  cactus
+- fix EXTRAVERSION
+- unionfs up to 2.5.10
+- BFS up to 411
+
 Revision 1.204.2.161  2011/09/27 22:08:17  cactus
 - rel 0.5; config not updated
 
================================================================

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