rpms/module-init-tools/devel depmod-dist.conf, NONE, 1.1 modprobe-dist-oss.conf, NONE, 1.1 modprobe-dist.conf, NONE, 1.1 module-init-tools.spec, 1.84, 1.85 depmod-fedora.conf, 1.1, NONE modprobe-fedora-oss.conf, 1.1, NONE modprobe-fedora.conf, 1.1, NONE

Thu Mar 19 19:12:05 UTC 2009

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191

Modified Files:
	module-init-tools.spec 
Added Files:
	depmod-dist.conf modprobe-dist-oss.conf modprobe-dist.conf 
Removed Files:
	depmod-fedora.conf modprobe-fedora-oss.conf 
	modprobe-fedora.conf 
Log Message:
Rename config files supplied by us to dist.conf and require glibc-static again.

--- NEW FILE depmod-dist.conf ---
#
# depmod.conf
#

# override default search ordering for kmod packaging
search updates extra built-in weak-updates


--- NEW FILE modprobe-dist-oss.conf ---
# OSS Sound Support
# This has been disabled in F11 onwards because it can interfere with the
# PulseAudio sound service (a legacy OSS application can prevent PulseAudio
# applications from playing sound by preventing PulseAudio from (re-)opening
# the sound device). To re-enable support, uncomment the following line:
#
# install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss


--- NEW FILE modprobe-dist.conf ---
# default modutils aliases
alias binfmt-204 binfmt_aout
alias binfmt-263 binfmt_aout
alias binfmt-264 binfmt_aout
alias binfmt-267 binfmt_aout
alias binfmt-387 binfmt_aout
alias block-major-1-* rd
alias block-major-3-* ide-probe-mod
alias block-major-8-* sd_mod
alias block-major-9-* md
alias block-major-11-* sr_mod
alias block-major-13-* xd
alias block-major-15-* cdu31a
alias block-major-16-* gscd
alias block-major-17-* optcd
alias block-major-18-* sjcd
alias block-major-20-* mcdx
alias block-major-22-* ide-probe-mod
alias block-major-23-* mcd
alias block-major-24-* sonycd535
alias block-major-25-* sbpcd
alias block-major-26-* sbpcd
alias block-major-27-* sbpcd
alias block-major-29-* aztcd
alias block-major-32-* cm206
alias block-major-33-* ide-probe-mod
alias block-major-34-* ide-probe-mod
alias block-major-37-* ide-tape
alias block-major-44-* ftl
alias block-major-46-* pcd
alias block-major-47-* pf
alias block-major-56-* ide-probe-mod
alias block-major-57-* ide-probe-mod
alias block-major-88-* ide-probe-mod
alias block-major-89-* ide-probe-mod
alias block-major-90-* ide-probe-mod
alias block-major-91-* ide-probe-mod
alias block-major-93-* nftl
alias block-major-113-* viocd
alias char-major-4-* serial
alias char-major-5-* serial
alias char-major-9-* st
alias char-major-10-2 msbusmouse
alias char-major-10-3 atixlmouse
alias char-major-10-135 rtc
alias char-major-10-139 openprom
alias char-major-10-157 applicom
alias char-major-10-175 agpgart
alias char-major-10-250 hci_vhci
alias char-major-13-* input
alias char-major-13-0 joydev
alias char-major-13-32 mousedev
alias char-major-19-* cyclades
alias char-major-20-* cyclades
alias char-major-22-* pcxx
alias char-major-23-* pcxx
alias char-major-27-* zftape
alias char-major-34-* scc
alias char-major-35-* tclmidi
alias char-major-36-* netlink
alias char-major-48-* riscom8
alias char-major-49-* riscom8
alias char-major-57-* esp
alias char-major-58-* esp
alias char-major-63-* kdebug
alias char-major-90-* mtdchar
alias char-major-96-* pt
alias char-major-97-* pg
alias char-major-107-* 3dfx
alias char-major-109-* lvm-mod
alias char-major-188-* usbserial
alias char-major-200-* vxspec
alias char-major-206-* osst
alias char-major-216-* rfcomm
alias dos msdos
alias dummy0 dummy
alias dummy1 dummy
alias iso9660 isofs
alias net-pf-1 unix
alias net-pf-2 ipv4
alias net-pf-17 af_packet
alias netalias-2 ip_alias
alias irlan0 irlan
alias irda-dongle-0 tekram
alias irda-dongle-1 esi
alias irda-dongle-2 actisys
alias irda-dongle-3 actisys
alias irda-dongle-4 girbil
alias irda-dongle-5 litelink
alias irda-dongle-6 airport
alias irda-dongle-7 old_belkin
alias plip0 plip
alias plip1 plip
alias tunl0 ipip
alias cipcb0 cipcb
alias cipcb1 cipcb
alias cipcb2 cipcb
alias cipcb3 cipcb
alias slip0 slip
alias slip1 slip
alias tty-ldisc-1 slip
alias tty-ldisc-3 ppp_async
alias tty-ldisc-11 irtty-sir
alias tty-ldisc-14 ppp_synctty
alias tty-ldisc-15 hci_uart
alias ppp-compress-18 ppp_mppe
install ppp-compress-21 /bin/true
alias ppp-compress-24 ppp_deflate
alias ppp-compress-26 ppp_deflate
alias parport_lowlevel parport_pc
alias usbdevfs usbcore
alias xfrm-type-2-50 esp4
alias xfrm-type-2-51 ah4
alias xfrm-type-2-108 ipcomp
alias xfrm-type-10-50 esp6
alias xfrm-type-10-51 ah6
alias xfrm-type-10-108 ipcomp6
alias cipher_null crypto_null
alias digest_null crypto_null
alias compress_null crypto_null
alias sha384 sha512
install binfmt-0000 /bin/true
install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; }
install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; }
install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; }
install char-major-10 /bin/true
install char-major-10-1 /bin/true
install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
install net-pf-19 /bin/true
install net-pf-3 /bin/true
install net-pf-6 /bin/true
install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp
install scsi_hostadapter /bin/true
install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc
remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc
remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd


alias usb-uhci uhci-hcd
alias usb-ohci ohci-hcd
alias uhci uhci-hcd

alias char-major-116-* snd
alias sound-service-*-0 snd-mixer-oss
alias sound-service-*-1 snd-seq-oss
alias sound-service-*-3 snd-pcm-oss
alias sound-service-*-8 snd-seq-oss
alias sound-service-*-12 snd-pcm-oss

install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]}

alias nfs4 nfs
alias rpc_pipefs sunrpc
alias rpc_svc_gss_pipefs sunrpc

install eth1394 /bin/true

install snd-emu10k1 /sbin/modprobe --ignore-install snd-emu10k1 && /sbin/modprobe snd-emu10k1-synth

alias gre0 ip_gre
alias char-major-89-* i2c-dev


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- module-init-tools.spec	19 Mar 2009 18:50:42 -0000	1.84
+++ module-init-tools.spec	19 Mar 2009 19:11:35 -0000	1.85
@@ -2,22 +2,22 @@
 Name: module-init-tools
 Version: 3.7
 %define PreRelease -pre9
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
 Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2.sign
-Source2: modprobe-fedora.conf
+Source2: modprobe-dist.conf
 Source3: weak-modules
-Source4: depmod-fedora.conf
-Source5: modprobe-fedora-oss.conf
+Source4: depmod-dist.conf
+Source5: modprobe-dist-oss.conf
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modutils-devel modutils
 Provides: modutils = %{version}
 BuildPrereq: zlib-devel docbook-utils
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: zlib-static
+BuildRequires: zlib-static glibc-static
 
 %description
 The module-init-tools package includes various programs needed for automatic
@@ -46,12 +46,12 @@
 
 mkdir -p $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/fedora.conf
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/modprobe.d/fedora-oss.conf
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/dist.conf
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/modprobe.d/dist-oss.conf
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/weak-modules
 
 mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/depmod.d/fedora.conf
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/depmod.d/dist.conf
 
 mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
 
@@ -72,6 +72,10 @@
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Thu Mar 19 2009 Jon Masters <jcm at redhat.com> - 3.7-7 (pre9)
+- Rebuild with stock vendor conf files called "dist.conf" not "fedora.conf".
+- Re-add glibc-static dependency because of zlib_flags requiring static.
+
 * Thu Mar 19 2009 Jon Masters <jcm at redhat.com> - 3.7-6 (pre9)
 - Rebuild with fixes, remove 2.4 compat and static build, and disable OSS.
 


--- depmod-fedora.conf DELETED ---


--- modprobe-fedora-oss.conf DELETED ---


--- modprobe-fedora.conf DELETED ---


