/[packages]/cauldron/kernel-tmb/pristine/SPECS/kernel-tmb.spec

Diff of /cauldron/kernel-tmb/pristine/SPECS/kernel-tmb.spec

Parent Directory | Revision Log | View Patch Patch

-revision 491034 by tmb,
Thu Oct  3 19:56:22 2013 UTC
+revision 555222 by tmb,
Wed Dec  4 22:19:37 2013 UTC
 Line 2
  # *tmb* series kernels now use kernel.org versioning
  #
  %define kernelversion   3
- %define patchlevel      10
+ %define patchlevel      12
  # sublevel is now used for -stable patches
- %define sublevel        15
+ %define sublevel        3
  # extstable is for extended stable patches
  %define extstable       0
 Line 228 
 input and output, etc.
  ### Global Requires/Provides
  %define requires1       bootloader-utils >= 1.16-1
- %define requires2       dracut >= 025-8
+ %define requires2       dracut >= 033-1
  %define requires3       kmod >= 12-2
  %define requires4       sysfsutils >= 2.1.0-16
  %define requires5       kernel-firmware >= 20130624-1
 Line 237 
 input and output, etc.
  %define kprovides2      kernel = %{tar_ver}
  %define kprovides3      alsa = 1.0.26
  %define kprovides_server drbd-api = 88
+ # conflict dkms packages that dont support kernel-3.12
- # conflict dkms packages that dont support kernel-3.10
+ %define kconflicts1     dkms-broadcom-wl < 6.30.223.141-1
- %define kconflicts1     dkms-broadcom-wl < 5.100.82.112-13
+ %define kconflicts1     dkms-fglrx < 13.200.16-1
- %define kconflicts1     dkms-fglrx < 13.101-0.3
+ %define kconflicts2     dkms-nvidia-current < 319.60-2
- %define kconflicts2     dkms-nvidia-current < 319.32-2
+ %define kconflicts3     dkms-nvidia304 < 304.108-2
- %define kconflicts3     dkms-nvidia304 < 304.88-4
+ %define kconflicts4     dkms-nvidia173 < 173.14.38-1
- %define kconflicts4     dkms-nvidia173 < 173.14.37-4
  # (tmb) nvidia96xx does not support this kernel or x11-server-1.13
  %define kconflicts5     dkms-nvidia96xx <= 96.43.23
  %define kconflicts6     dmms-xtables-addons < 2.3-1
-Line 252 
 input and output, etc.
+Line 251 
 input and output, etc.
  # (tmb) conflict too old drakxtools-backend to avoid bogus root=/dev/ (#9536)
  %define kconflicts8     drakxtools-backend < 15.37-1
  # (tmb) conflict older btrfs-progs to get the new in same transaction and in initrd
- %define kconflicts9     btrfs-progs < 0.20-0.rc1.20130607.2
+ %define kconflicts9     btrfs-progs < 3.12-1
  # (tmb) conflict too old plymouth (#10128)
  %define kconflicts10    plymouth < 0.8.6.1-8
  # (tmb) conflict too old radeon-firmware to get the uvd firmwares in initrd
  %define kconflicts11    radeon-firmware < 20130626-1
  Autoreqprov:            no
- BuildRequires:          gcc >= 4.0.1-5 kmod >= 7-6 bc
+ BuildRequires:          gcc >= 4.0.1-5 kmod >= 12-2 bc
  %description
  %common_description_kernel
-Line 728 
 SaveDevel() {
+Line 727 
 SaveDevel() {
                  rm -rf $TempDevelRoot/arch/x86
          %endif
+         rm -rf $TempDevelRoot/include/kvm/arm*
          # Clean the scripts tree, and make sure everything is ok (sanity check)
          # running prepare+scripts (tree was already "prepared" in build)
          pushd $TempDevelRoot >/dev/null
-Line 1017 
 done
+Line 1018 
 done
          rm -rf %{target_source}/arch/x86
  %endif
+ rm -rf %{target_source}/include/kvm/arm*
  # other misc files
  rm -f %{target_source}/{.config.old,.config.cmd,.mailmap,.missing-syscalls.d,arch/.gitignore}
  rm -rf %{target_source}/.tmp_depmod/
-Line 1140 
 popd
+Line 1143 
 popd
  %endif
  %changelog
+ * Wed Dec 4 2013 Thomas Backlund <tmb@mageia.org> 3.12.3-1.mga4
+ - update to 3.12.3
+ - drop merged patches:
+   * AA01-AA15: stable queue fixes
+   * DB10: bluetooth suspend/resume fix
+   * MB13-MB15: ndiswrapper buildfixes
+ - update patches:
+   * CK01: -ck patchset including BFS 0.444
+ - * MB10: ndiswrapper 1.59
+ - add patches:
+   * FS01-FS02: squashfs multi-decompressor support
+ * Sun Nov 17 2013 Thomas Backlund <tmb@mageia.org> 3.12.0-2.mga4
+ - add -stable queue patches:
+   * AA01: net/mlx4_core: Fix call to __mlx4_unregister_mac
+   * AA02: net: sctp: do not trigger BUG_ON in sctp_cmd_delete_tcb
+   * AA03: net: flow_dissector: fail on evil iph->ihl
+   * AA04: virtio-net: correctly handle cpu hotplug notifier during resuming
+   * AA05: xen-netback: use jiffies_64 value to calculate credit timeout
+   * AA06: cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures
+   * AA07: tcp: gso: fix truesize tracking
+   * AA08: tcp: fix SYNACK RTT estimation in Fast Open
+   * AA09: tcp: only take RTT from timestamps if new data is acked
+   * AA10: tcp: do not rearm RTO when future data are sacked
+   * AA11: ipv6: ip6_dst_check needs to check for expired dst_entries
+   * AA12: ipv6: reset dst.expires value when clearing expire flag
+   * AA13: hyperv-fb: add pci stub
+   * AA14: USB: add new zte 3g-dongle's pid to option.c
+   * AA15: ALSA: hda - hdmi: Fix reported channel map on common default layouts
+   * DB10: bluetooth: fix suspend/resume issue
+ * Mon Nov  4 2013 Thomas Backlund <tmb@mageia.org> 3.12.0-1.mga4
+ - update to 3.12 final
+ * Mon Oct 14 2013 Thomas Backlund <tmb@mageia.org> 3.12.0-0.rc5.1.mga4
+ - update to 3.12-rc5
+ - drop patches:
+   * DN40: bcma BCM43142 support (merged)
+ - update patches:
+   * FO01-FO09: overlayfs support
+ - rediff patches:
+   * NI10: netfilter IFWLOG support
+ - add patches:
+   * MB15: ndiswrapper buildfix for kernel 3.12
+ - disable patches:
+   * CK01: BFS scheduler (needs update to support 3.12)
+   * FR01: reiser4 support (needs update to support 3.12)
+   * KP01: TuxOnIce support (needs update to support 3.12)
+ - update filelists
+ - update defconfigs
+ - update dkms conflicts
  * Thu Oct 3 2013 Thomas Backlund <tmb@mageia.org> 3.10.15-1.mga4
  - update to 3.10.15
  - drop merged patches:

 Legend:



Removed from v.491034
 


changed lines


 
Added in v.555222
 Legend:



Removed from v.491034
 


changed lines


 
Added in v.555222
-Removed from v.491034
+Added in v.555222

	ViewVC Help
Powered by ViewVC 1.1.30