|
|
@@ -24,10 +24,10 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
# adding some text to the end of the version number.
|
|
|
#
|
|
|
%define sublevel 35
|
|
|
-%define patchlevel 4
|
|
|
+%define patchlevel 6
|
|
|
%define kversion 2.6.%{sublevel}
|
|
|
%define rpmversion 2.6.%{sublevel}
|
|
|
-%define release 3%{?_dist_release}
|
|
|
+%define release 6%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
|
%define hdrarch %_target_cpu
|
|
|
@@ -179,7 +179,10 @@ AutoReqProv: no
|
|
|
#
|
|
|
BuildRequires: module-init-tools >= 3.6
|
|
|
BuildRequires: patch >= 2.5.4, bash >= 2.03, sh-utils, tar
|
|
|
-BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils
|
|
|
+BuildRequires: bzip2, gzip
|
|
|
+BuildRequires: xz-lzma-compat
|
|
|
+BuildRequires: findutils, m4, perl, make >= 3.78, gnupg, diffutils
|
|
|
+BuildRequires: net-tools
|
|
|
BuildRequires: gcc >= 3.3.5, binutils >= 2.15
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -270,15 +273,15 @@ Patch2504: linux-2.6-at76.patch
|
|
|
# 6000 to 10000 is for Vine Linux
|
|
|
#
|
|
|
|
|
|
-# unionfs 2.5.5
|
|
|
+# unionfs 2.5.6
|
|
|
# http://www.am-utils.org/project-unionfs.html
|
|
|
-Patch6030: unionfs-2.5.5_for_2.6.35.4.diff.gz
|
|
|
+Patch6030: unionfs-2.5.6_for_2.6.35.5.diff.gz
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
-#%define tuxonice_version 3.1.git20100519-for-2.6.34
|
|
|
-#Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
|
|
|
-Patch9000: current-tuxonice-for-2.6.35.patch-20100815-v1.bz2
|
|
|
+%define tuxonice_version 3.2-rc2-for-2.6.35
|
|
|
+Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
|
|
|
+#Patch9000: current-tuxonice-for-2.6.35.patch-20100815-v1.bz2
|
|
|
|
|
|
#
|
|
|
# 10000 to 20000 is for stuff that has to come last due to the
|
|
|
@@ -569,7 +572,7 @@ cd linux-%{kversion}
|
|
|
|
|
|
%patch2504 -p1
|
|
|
|
|
|
-# nouveau + drm fixes
|
|
|
+# drm fixes
|
|
|
|
|
|
|
|
|
# v4l
|
|
|
@@ -1099,6 +1102,19 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Sep 27 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-6
|
|
|
+- update to 2.6.35.6
|
|
|
+ - remove patch2600 which is merged in upstream
|
|
|
+
|
|
|
+* Mon Sep 27 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-5
|
|
|
+- add patch2600 to fix i915 modesetting failure on intel 8xx (<BTS:1039>)
|
|
|
+- add BR: xz-lzma-compat, net-tools (<BTS:1038>)
|
|
|
+- update unionfs to 2.5.6
|
|
|
+- update tuxonice to 3.2-rc2
|
|
|
+
|
|
|
+* Tue Sep 21 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-4
|
|
|
+- update to 2.6.35.5
|
|
|
+
|
|
|
* Fri Sep 03 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-3
|
|
|
- update to 2.6.35.4
|
|
|
|
daisuke