Author: glen Date: Sat Jan 19 17:20:10 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- use %{name} macro
---- Files affected:
SPECS:
kernel.spec (1.441.2.1558.2.127 -> 1.441.2.1558.2.128) , kernel-desktop.spec
(1.147 -> 1.148)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.127
SPECS/kernel.spec:1.441.2.1558.2.128
--- SPECS/kernel.spec:1.441.2.1558.2.127 Sat Jan 19 18:11:28 2008
+++ SPECS/kernel.spec Sat Jan 19 18:20:03 2008
@@ -340,7 +340,7 @@
Requires: geninitrd >= 2.57
Requires: module-init-tools >= 0.9.9
Provides: %{name}-up = %{epoch}:%{version}-%{release}
-Provides: kernel%{subname}(netfilter) = %{netfilter_snap}
+Provides: %{name}(netfilter) = %{netfilter_snap}
%if %{with xen0}
Provides: kernel(xen0) = %{xen_version}
%endif
@@ -561,7 +561,7 @@
Requires: coreutils
Requires: geninitrd >= 2.26
Requires: module-init-tools >= 0.9.9
-Provides: kernel%{subname}(netfilter) = %{netfilter_snap}
+Provides: %{name}(netfilter) = %{netfilter_snap}
%if %{with xen0}
Provides: kernel(xen0) = %{xen_version}
%endif
@@ -730,7 +730,7 @@
Summary: Header files for the Linux kernel
Summary(pl.UTF-8): Pliki nagĹĂłwkowe jÄ
dra Linuksa
Group: Development/Building
-Provides: kernel-headers(netfilter) = %{netfilter_snap}
+Provides: %{name}-headers(netfilter) = %{netfilter_snap}
Autoreqprov: no
%description headers
@@ -747,6 +747,7 @@
Summary(pl.UTF-8): Pliki sĹuĹźÄ
ce do budowania moduĹĂłw jÄ
dra
Group: Development/Building
Requires: %{name}-headers = %{epoch}:%{version}-%{release}
+Conflicts: rpmbuild(macros) < 1.321
Autoreqprov: no
%description module-build
@@ -1802,6 +1803,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1558.2.128 2008-01-19 17:20:03 glen
+- use %{name} macro
+
Revision 1.441.2.1558.2.127 2008-01-19 17:11:28 glen
- description merge from LINUX_2_6_22
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.147 SPECS/kernel-desktop.spec:1.148
--- SPECS/kernel-desktop.spec:1.147 Sat Jan 19 17:42:28 2008
+++ SPECS/kernel-desktop.spec Sat Jan 19 18:20:04 2008
@@ -106,121 +106,121 @@
Source2:
http://www.tuxonice.net/downloads/all/suspend2-%{suspend_version}-for-%{suspend_kernel}.patch.bz2
# Source2-md5: f98f071b0f4e7897296d643854bb809f
-Source3: kernel-desktop-autoconf.h
-Source4: kernel-desktop-config.h
-Source5: kernel-desktop-module-build.pl
-
-Source20: kernel-desktop-common.config
-Source22: kernel-desktop-i386.config
-Source24: kernel-desktop-x86_64.config
-Source26: kernel-desktop-ppc.config
-
-Source41: kernel-desktop-preempt-rt.config
-Source42: kernel-desktop-preempt-nort.config
-Source43: kernel-desktop-suspend2.config
-Source44: kernel-desktop-patches.config
-Source45: kernel-desktop-netfilter.config
-Source46: kernel-desktop-grsec.config
-Source47: kernel-desktop-wrr.config
-Source48: kernel-desktop-fbsplash.config
-Source49: kernel-desktop-bootsplash.config
+Source3: %{name}-autoconf.h
+Source4: %{name}-config.h
+Source5: %{name}-module-build.pl
+
+Source20: %{name}-common.config
+Source22: %{name}-i386.config
+Source24: %{name}-x86_64.config
+Source26: %{name}-ppc.config
+
+Source41: %{name}-preempt-rt.config
+Source42: %{name}-preempt-nort.config
+Source43: %{name}-suspend2.config
+Source44: %{name}-patches.config
+Source45: %{name}-netfilter.config
+Source46: %{name}-grsec.config
+Source47: %{name}-wrr.config
+Source48: %{name}-fbsplash.config
+Source49: %{name}-bootsplash.config
###
# Patches
###
-Patch0: kernel-desktop-preempt-rt.patch
+Patch0: %{name}-preempt-rt.patch
# Jens Axboe's fcache patch (for ext3 only)
#
http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=118e3e9250ef319b6e77cdbc25dc4d26084c14f
# http://en.opensuse.org/Fcache-howto
-Patch6: kernel-desktop-fcache.patch
+Patch6: %{name}-fcache.patch
### Con Kolivas patchset
-Patch7: kernel-desktop-ck.patch
+Patch7: %{name}-ck.patch
-Patch9: kernel-desktop-grsec-minimal.patch
+Patch9: %{name}-grsec-minimal.patch
### filesystems
# based on
ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/reiser4-for-2.6.22-2.patch.gz
-Patch10: kernel-desktop-reiser4.patch
+Patch10: %{name}-reiser4.patch
# Squashfs from squashfs:
http://dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz for
linux-2.6.20
-Patch11: kernel-desktop-squashfs.patch
+Patch11: %{name}-squashfs.patch
#
http://dl.sourceforge.net/sourceforge/supermount-ng/supermount-ng-2.2.2-2.6.22.1_madgus_gcc34.patch.gz
-Patch12: kernel-desktop-supermount-ng.patch
+Patch12: %{name}-supermount-ng.patch
#
http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.2_for_2.6.22.4.diff.gz
-Patch13: kernel-desktop-unionfs.patch
+Patch13: %{name}-unionfs.patch
# http://client.linux-nfs.org/Linux-2.6.x/2.6.22/linux-2.6.22-NFS_ALL.dif
-Patch14: kernel-desktop-NFS_ALL.patch
+Patch14: %{name}-NFS_ALL.patch
#
http://www.citi.umich.edu/projects/nfsv4/linux/kernel-patches/2.6.22-rc5-1/linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
-Patch15: kernel-desktop-CITI_NFS4_ALL.patch
+Patch15: %{name}-CITI_NFS4_ALL.patch
### hardware
# tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
-Patch20: kernel-desktop-tahoe9xx.patch
+Patch20: %{name}-tahoe9xx.patch
# Derived from
http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
-Patch21: kernel-desktop-sk98lin.patch
+Patch21: %{name}-sk98lin.patch
#
http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
-Patch22: kernel-desktop-vesafb-tng.patch
-Patch23: kernel-desktop-dmi-decode-and-save-oem-string-information.patch
+Patch22: %{name}-vesafb-tng.patch
+Patch23: %{name}-dmi-decode-and-save-oem-string-information.patch
# from http://www.zen24593.zen.co.uk/hdaps/hdaps_protect-2.6.18.3-2.patch
-Patch24: kernel-desktop-hdaps_protect.patch
+Patch24: %{name}-hdaps_protect.patch
# http://pred.dcaf-security.org/sata_nv-ncq-support-mcp51-mcp55-mcp61.patch
# NCQ Functionality for newer nvidia chipsets (MCP{51,55,61}) by nvidia crew
-Patch25: kernel-desktop-sata_nv-ncq.patch
+Patch25: %{name}-sata_nv-ncq.patch
#
http://memebeam.org/free-software/toshiba_acpi/toshiba_acpi-dev_toshiba_test5-linux_2.6.21.patch
-Patch26: kernel-desktop-toshiba-acpi.patch
+Patch26: %{name}-toshiba-acpi.patch
### console
# ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
-Patch30: kernel-desktop-bootsplash.patch
+Patch30: %{name}-bootsplash.patch
#
http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.20-rc6.patch
-Patch31: kernel-desktop-fbsplash.patch
+Patch31: %{name}-fbsplash.patch
######## netfilter snap
## base
-Patch40: kernel-desktop-pom-ng-IPV4OPTSSTRIP.patch
-Patch41: kernel-desktop-pom-ng-ipv4options.patch
-Patch42: kernel-desktop-pom-ng-set.patch
-Patch43: kernel-desktop-pom-ng-u32.patch
-Patch44: kernel-desktop-pom-ng-ROUTE.patch
-Patch45: kernel-desktop-pom-ng-TARPIT.patch
-Patch46: kernel-desktop-pom-ng-mms-conntrack-nat.patch
-Patch47: kernel-desktop-pom-ng-IPMARK.patch
-Patch48: kernel-desktop-pom-ng-connlimit.patch
-Patch49: kernel-desktop-pom-ng-geoip.patch
-Patch50: kernel-desktop-pom-ng-ipp2p.patch
-Patch51: kernel-desktop-pom-ng-time.patch
-Patch52: kernel-desktop-pom-ng-rsh.patch
-Patch53: kernel-desktop-pom-ng-rpc.patch
+Patch40: %{name}-pom-ng-IPV4OPTSSTRIP.patch
+Patch41: %{name}-pom-ng-ipv4options.patch
+Patch42: %{name}-pom-ng-set.patch
+Patch43: %{name}-pom-ng-u32.patch
+Patch44: %{name}-pom-ng-ROUTE.patch
+Patch45: %{name}-pom-ng-TARPIT.patch
+Patch46: %{name}-pom-ng-mms-conntrack-nat.patch
+Patch47: %{name}-pom-ng-IPMARK.patch
+Patch48: %{name}-pom-ng-connlimit.patch
+Patch49: %{name}-pom-ng-geoip.patch
+Patch50: %{name}-pom-ng-ipp2p.patch
+Patch51: %{name}-pom-ng-time.patch
+Patch52: %{name}-pom-ng-rsh.patch
+Patch53: %{name}-pom-ng-rpc.patch
# based on
http://www.svn.barbara.eu.org/ipt_account/attachment/wiki/Software/ipt_account-0.1.21-20070804164729.tar.gz?format=raw
-Patch67: kernel-desktop-ipt_account.patch
+Patch67: %{name}-ipt_account.patch
# based on
http://www.intra2net.com/de/produkte/opensource/ipt_account/pom-ng-ipt_ACCOUNT-1.10.tgz
-Patch68: kernel-desktop-ipt_ACCOUNT.patch
+Patch68: %{name}-ipt_ACCOUNT.patch
# netfilter-layer7-v2.13.tar.gz from http://l7-filter.sf.net/
-Patch69: kernel-desktop-layer7.patch
+Patch69: %{name}-layer7.patch
######## End netfilter
### net software
# based on 2.6.17 patch from
http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff,
# some stuff moved from net/sched/sch_generic.c to net/core/dev.c for 2.6.19
# compatibility. Should work, but not with wrr.
-Patch70: kernel-desktop-imq.patch
+Patch70: %{name}-imq.patch
# esfq from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
-Patch71: kernel-desktop-esfq.patch
+Patch71: %{name}-esfq.patch
# derived from
ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
-Patch72: kernel-desktop-atm-vbr.patch
-Patch73: kernel-desktop-atmdd.patch
+Patch72: %{name}-atm-vbr.patch
+Patch73: %{name}-atmdd.patch
# wrr http://www.zz9.dk/patches/wrr-linux-070717-2.6.22.patch.gz
-Patch74: kernel-desktop-wrr.patch
+Patch74: %{name}-wrr.patch
# adds some ids for hostap suported cards and monitor_enable from/for
aircrack-ng
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
-Patch75: kernel-desktop-hostap.patch
+Patch75: %{name}-hostap.patch
# http://www.ntop.org/PF_RING.html 20070610
-#Patch76: kernel-desktop-PF_RING.patch
+#Patch76: %{name}-PF_RING.patch
# The following patch extend the routing functionality in Linux
# to support static routes (defined by user), new way to use the
# alternative routes, the reverse path protection (rp_filter),
@@ -228,26 +228,26 @@
# gateways are used.
# http://www.ssi.bg/~ja/routes-2.6.22-15.diff
# We need to disable CONFIG_IP_ROUTE_MULTIPATH_CACHED
-Patch77: kernel-desktop-routes.patch
+Patch77: %{name}-routes.patch
### Additional features
# http://www.bullopensource.org/cpuset/ - virtual CPUs
-Patch85: kernel-desktop-cpuset_virtualization.patch
+Patch85: %{name}-cpuset_virtualization.patch
### Fixes
-Patch91: kernel-desktop-fbcon-margins.patch
-Patch92: kernel-desktop-static-dev.patch
-Patch100: kernel-desktop-small_fixes.patch
+Patch91: %{name}-fbcon-margins.patch
+Patch92: %{name}-static-dev.patch
+Patch100: %{name}-small_fixes.patch
Patch101: kernel-bcm43xx-pcie-2.6_18.1.patch
# Wake-On-Lan fix for nForce drivers; using
http://atlas.et.tudelft.nl/verwei90/nforce2/wol.html
# Fix verified for that kernel version.
-Patch102: kernel-desktop-forcedeth-WON.patch
-Patch103: kernel-desktop-ueagle-atm-freezer.patch
+Patch102: %{name}-forcedeth-WON.patch
+Patch103: %{name}-ueagle-atm-freezer.patch
# investigate
-Patch104: kernel-desktop-ppc-ICE.patch
+Patch104: %{name}-ppc-ICE.patch
#
http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch
-Patch105: kernel-desktop-rndis_host.patch
+Patch105: %{name}-rndis_host.patch
# add tty ioctl to figure physical device of the console. used by
showconsole.spec (blogd)
Patch106: kernel-TIOCGDEV.patch
@@ -268,7 +268,7 @@
%{?with_bootsplash:Suggests: bootsplash}
%{?with_fbsplash:Suggests: splashutils}
Provides: kernel(netfilter) = %{netfilter_snap}
-Provides: kernel-desktop(netfilter) = %{netfilter_snap}
+Provides: %{name}(netfilter) = %{netfilter_snap}
Conflicts: e2fsprogs < %{_e2fsprogs_ver}
Conflicts: isdn4k-utils < %{_isdn4k_utils_ver}
Conflicts: jfsutils < %{_jfsutils_ver}
@@ -445,7 +445,7 @@
Summary(de.UTF-8): Header Dateien fĂźr den Linux-Kernel
Summary(pl.UTF-8): Pliki nagĹĂłwkowe jÄ
dra Linuksa
Group: Development/Building
-Provides: kernel-desktop-headers(netfilter) = %{netfilter_snap}
+Provides: %{name}-headers(netfilter) = %{netfilter_snap}
Autoreqprov: no
%description headers
@@ -686,7 +686,7 @@
Config="%{_target_base_arch}"
cat %{SOURCE20} > .config
-cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> .config
+cat $RPM_SOURCE_DIR/%{name}-$Config.config >> .config
echo "CONFIG_LOCALVERSION=\"-%{_localversion}\"" >> .config
%ifarch %{ix86}
@@ -1084,6 +1084,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.148 2008-01-19 17:20:04 glen
+- use %{name} macro
+
Revision 1.147 2008-01-19 16:42:28 glen
- netfilter provide with alt kernel support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.127&r2=1.441.2.1558.2.128&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.147&r2=1.148&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
